diff options
| author | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2014-11-26 13:34:40 +0200 |
|---|---|---|
| committer | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2014-11-26 13:34:40 +0200 |
| commit | 120e052e326097e56ae1d5eea7eb8d2675c1cb44 (patch) | |
| tree | 5f07ed688bc1402de4e90e07e41d255691f73464 /indra/newview | |
| parent | b07bfba19810e4275d9631e067381d501245a276 (diff) | |
MAINT-2336 FIXED Avatar continues to move in edit mode
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llagentcamera.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp index 2356a84688..b0b2cfd435 100755 --- a/indra/newview/llagentcamera.cpp +++ b/indra/newview/llagentcamera.cpp @@ -35,6 +35,7 @@ #include "llfloaterreg.h" #include "llhudmanager.h" #include "lljoystickbutton.h" +#include "llmorphview.h" #include "llmoveview.h" #include "llselectmgr.h" #include "llsmoothstep.h" @@ -2269,7 +2270,10 @@ void LLAgentCamera::changeCameraToCustomizeAvatar() gFocusMgr.setKeyboardFocus( NULL ); gFocusMgr.setMouseCapture( NULL ); - + if( gMorphView ) + { + gMorphView->setVisible( TRUE ); + } // Remove any pitch or rotation from the avatar LLVector3 at = gAgent.getAtAxis(); at.mV[VZ] = 0.f; |