From 24a6c3fda2ba3aa1f40ee31b6f1fc025a6623833 Mon Sep 17 00:00:00 2001 From: prep Date: Thu, 14 Mar 2013 14:43:11 -0400 Subject: modified_cof_cb() issues a updateAppearanceFromCOF() right before this function - removed extra update call. Sh-3650 & Sh-3985 --- indra/newview/llvoavatarself.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'indra/newview/llvoavatarself.cpp') diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp index 64443f55af..ea39d44c73 100644 --- a/indra/newview/llvoavatarself.cpp +++ b/indra/newview/llvoavatarself.cpp @@ -2989,9 +2989,7 @@ void LLVOAvatarSelf::onCustomizeEnd(bool disable_camera_switch) { gAgentCamera.changeCameraToDefault(); gAgentCamera.resetView(); - } - - LLAppearanceMgr::instance().updateAppearanceFromCOF(); + } } } -- cgit v1.2.3 From d41e1cf171144a4903f60272dd09076aa5afa43c Mon Sep 17 00:00:00 2001 From: prep Date: Mon, 18 Mar 2013 18:10:40 -0400 Subject: Fix for sh-4014. This was a regression caused by fix for sh-3650. --- indra/newview/llvoavatarself.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'indra/newview/llvoavatarself.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(); + } } } -- cgit v1.2.3