summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMnikolenko Productengine <mnikolenko@productengine.com>2022-06-17 19:00:38 +0300
committerMnikolenko Productengine <mnikolenko@productengine.com>2022-06-17 19:00:38 +0300
commite8dd01beecaeea8b67c88ffa2212411e672495b6 (patch)
treea1f80625a2f24ef5501d2a0ecf84c64aa631058c
parent9f5a38b98ef0e05828de729004447e572d139fd4 (diff)
SL-17589 FIXED Camera does not zoom correctly when editing wearables
-rw-r--r--indra/newview/llpaneleditwearable.cpp3
-rw-r--r--indra/newview/llviewerwindow.cpp1
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpaneleditwearable.cpp b/indra/newview/llpaneleditwearable.cpp
index be11a4a9f3..6e897e2c7e 100644
--- a/indra/newview/llpaneleditwearable.cpp
+++ b/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();
}
}
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 8e565bbdca..f4a0b80548 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/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"