Index: source/blender/editors/space_view3d/view3d_draw.c
===================================================================
--- source/blender/editors/space_view3d/view3d_draw.c	(revision 47774)
+++ source/blender/editors/space_view3d/view3d_draw.c	(working copy)
@@ -817,14 +817,20 @@
 				if ((v3d->camera) && (v3d->camera->type == OB_CAMERA)) {
 					Camera *cam;
 					cam = v3d->camera->data;
-					name = (cam->type != CAM_ORTHO) ? "Camera Persp" : "Camera Ortho";
+
+					if (cam->type == CAM_ORTHO){
+						name = "Camera Ortho";
+					}
+					else if (cam->type == CAM_PANO){
+						name = "Camera Panoramic";
+					}
+					else {
+						name = "Camera Persp";
+					}
 				}
-				else {
-					name = "Object as Camera";
-				}
 			}
 			else {
-				name = (rv3d->persp == RV3D_ORTHO) ? "User Ortho" : "User Persp";
+				name = (rv3d->persp == RV3D_ORTHO) ? "User Ortho" : "User Persp";
 			}
 			break;
 	}
@@ -835,14 +841,52 @@
 static void draw_viewport_name(ARegion *ar, View3D *v3d)
 {
 	RegionView3D *rv3d = ar->regiondata;
-	char tmpstr[24];
-	
-	if (v3d->localvd) {
-		BLI_snprintf(tmpstr, sizeof(tmpstr), "%s (Local)", name);
-		name = tmpstr;
-	}
+	char tmpstr[32];
 
+	/* If we have an object as camera*/
+	if (rv3d->persp == RV3D_CAMOB && (v3d->camera) && (v3d->camera->type != OB_CAMERA)) {
+		BLI_snprintf(tmpstr, sizeof(tmpstr), "%s as Camera", v3d->camera->id.name + 2);
+		name = tmpstr;
+	}
+
+	/* If "Only Render" is on */
+	if (v3d->flag2 & V3D_RENDER_OVERRIDE) {
+		BLI_snprintf(tmpstr, sizeof(tmpstr), "%s (Render)", name);
+		name = tmpstr;
+	}
+
+	/* If view is locked to an object */
+	if (v3d->ob_centre) {
+		v3d->ob_centre_cursor = FALSE;
+		BLI_snprintf(tmpstr, sizeof(tmpstr), "%s (Locked to %s)", name, v3d->ob_centre->id.name + 2);
+		name = tmpstr;
+	}
+
+	/* If view is locked to the cursor  */
+	if (v3d->ob_centre_cursor) {
+		BLI_snprintf(tmpstr, sizeof(tmpstr), "%s (Locked to Cursor)", name);
+		name = tmpstr;
+	}
+
+	/* If view is locked to the camera */
+	if (rv3d->persp == RV3D_CAMOB && v3d->flag2 & V3D_LOCK_CAMERA) {
+		BLI_snprintf(tmpstr, sizeof(tmpstr), "%s (Locked)", name);
+		name = tmpstr;
+	}
+
+	/* If scene lock is off */
+	if (!v3d->scenelock) {
+		BLI_snprintf(tmpstr, sizeof(tmpstr), "[%s]", name);
+		name = tmpstr;
+	}
+
+	/* If we are in Local View */
+	if (v3d->localvd) {
+		BLI_snprintf(tmpstr, sizeof(tmpstr), "%s (Local)", name);
+		name = tmpstr;
+	}
+
 	if (name) {
 		UI_ThemeColor(TH_TEXT_HI);
 		BLF_draw_default_ascii(22,  ar->winy - 17, 0.0f, name, sizeof(tmpstr));