diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-03-18 18:45:08 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-03-18 18:45:08 -0400 |
| commit | 262549ce37517d0ba29f075945be9854e926170c (patch) | |
| tree | 7361561c37428e5da1078ccf65ecb3a03b98b230 /indra | |
| parent | 6fe98861335781973baf032bede81d4f2a55e965 (diff) | |
| parent | cec27955eca4705102d17c792558f0c7e0c6986b (diff) | |
merge
Diffstat (limited to 'indra')
| -rw-r--r--[-rwxr-xr-x] | indra/newview/app_settings/logcontrol.xml | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | indra/newview/llviewertexture.cpp | 0 | ||||
| -rw-r--r-- | indra/newview/llvoavatarself.cpp | 7 |
3 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/app_settings/logcontrol.xml b/indra/newview/app_settings/logcontrol.xml index c5561166fc..c5561166fc 100755..100644 --- a/indra/newview/app_settings/logcontrol.xml +++ b/indra/newview/app_settings/logcontrol.xml diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index 236b95253c..236b95253c 100755..100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp index ea39d44c73..d60ce6799b 100644 --- a/indra/newview/llvoavatarself.cpp +++ b/indra/newview/llvoavatarself.cpp @@ -2989,7 +2989,12 @@ void LLVOAvatarSelf::onCustomizeEnd(bool disable_camera_switch) { gAgentCamera.changeCameraToDefault(); gAgentCamera.resetView(); - } + } + + if (gAgent.getRegion() && gAgent.getRegion()->getCentralBakeVersion()) + { + LLAppearanceMgr::instance().requestServerAppearanceUpdate(); + } } } |