SL-17589 FIXED Camera does not zoom correctly when editing wearables

indra/newview/llpaneleditwearable.cpp

@@ -1308,7 +1308,8 @@ void LLPanelEditWearable::changeCamera(U8 subpart)
         gMorphView->setCameraOffset( subpart_entry->mCameraOffset );
         if (gSavedSettings.getBOOL("AppearanceCameraMovement"))
         {
-                gMorphView->updateCamera();
+            gAgentCamera.setFocusOnAvatar(FALSE, FALSE);
+            gMorphView->updateCamera();
         }
 }
 

indra/newview/llviewerwindow.cpp

@@ -103,7 +103,6 @@
 #include "llfilepicker.h"
 #include "llfirstuse.h"
 #include "llfloater.h"
-#include "llfloaterbuildoptions.h"
 #include "llfloaterbuyland.h"
 #include "llfloatercamera.h"
 #include "llfloaterland.h"