diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index ddd5d47e7806f859ad899f7dfc1e7351191b0acf..dad2c615e34bd37198ac625251d371a3b24e68d0 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -554,7 +554,6 @@ set(viewer_SOURCE_FILES
     llworldmapmessage.cpp
     llworldmipmap.cpp
     llworldmapview.cpp
-    llworldview.cpp
     llxmlrpclistener.cpp
     llxmlrpctransaction.cpp
     noise.cpp
@@ -1071,7 +1070,6 @@ set(viewer_HEADER_FILES
     llworldmapmessage.h
     llworldmipmap.h
     llworldmapview.h
-    llworldview.h
     llxmlrpclistener.h
     llxmlrpctransaction.h
     macmain.h
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index e0463e3c4a84ddfd5c54ad4630e7c4d5fcc216a5..9773275ede27ce4ea3b522befd5f073e0611d038 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -3017,6 +3017,12 @@ void LLViewerWindow::updateWorldViewRect(bool use_full_window)
 		new_world_rect.mTop = llround((F32)new_world_rect.mTop * mDisplayScale.mV[VY]);
 	}
 
+	if (gSavedSettings.getBOOL("SidebarCameraMovement") == FALSE)
+	{
+		// use right edge of window, ignoring sidebar
+		new_world_rect.mRight = mWindowRectRaw.mRight;
+	}
+
 	if (mWorldViewRectRaw != new_world_rect)
 	{
 		mWorldViewRectRaw = new_world_rect;
diff --git a/indra/newview/llworldview.cpp b/indra/newview/llworldview.cpp
index 665cc74a87b0e8706a9e3ad5b703b67fdc404063..7261e63147abbecaaae2b92b67f85c74659310ae 100644
--- a/indra/newview/llworldview.cpp
+++ b/indra/newview/llworldview.cpp
@@ -48,14 +48,14 @@ LLWorldView::LLWorldView(const Params& p)
 
 void LLWorldView::reshape(S32 width, S32 height, BOOL called_from_parent)
 {
-	if (FALSE == gSavedSettings.getBOOL("SidebarCameraMovement") )
-	{
-		LLView* main_view = LLUI::getRootView()->findChild<LLView>("main_view");
-		if(main_view)
-		{
-			width = main_view->getRect().getWidth();
-		}
-	}
+	//if (FALSE == gSavedSettings.getBOOL("SidebarCameraMovement") )
+	//{
+	//	LLView* main_view = LLUI::getRootView()->findChild<LLView>("main_view");
+	//	if(main_view)
+	//	{
+	//		width = main_view->getRect().getWidth();
+	//	}
+	//}
 	
 	LLUICtrl::reshape(width, height, called_from_parent);
 }
diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml
index e42b88abc3a70e291de974809484ea894181adbf..b2e4a7ad95db448774f2199567bf9747660c8140 100644
--- a/indra/newview/skins/default/xui/en/main_view.xml
+++ b/indra/newview/skins/default/xui/en/main_view.xml
@@ -50,7 +50,7 @@
                name="non_side_tray_view"
                user_resize="false"
                width="500">
-          <world_view bottom="500"
+          <view bottom="500"
                 follows="all"
                 height="500"
                 left="0"