From fe9fb67aea52b0c8ef900915ad41bb9728f23010 Mon Sep 17 00:00:00 2001 From: Nyx Linden Date: Tue, 12 Feb 2013 18:37:01 -0500 Subject: SH-3859 FIX adding or removing clothing in appearance edit mode are visible Added check to cancel any appearance update requests that occur while in appearance edit mode. Closing appearance edit mode does trigger an update, so should be safe to cancel intermediate requests without further changes. --- indra/newview/llappearancemgr.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'indra') diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index caeaf0970b..ecbb922adc 100755 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -3085,6 +3085,12 @@ public: void LLAppearanceMgr::requestServerAppearanceUpdate(LLCurl::ResponderPtr responder_ptr) { + if (gAgentAvatarp->isEditingAppearance()) + { + // don't send out appearance updates if in appearance editing mode + return; + } + if (!gAgent.getRegion()) { llwarns << "Region not set, cannot request server appearance update" << llendl; -- cgit v1.2.3