diff options
| author | Nyx Linden <nyx@lindenlab.com> | 2013-02-12 18:37:01 -0500 |
|---|---|---|
| committer | Nyx Linden <nyx@lindenlab.com> | 2013-02-12 18:37:01 -0500 |
| commit | fe9fb67aea52b0c8ef900915ad41bb9728f23010 (patch) | |
| tree | 0c672b4a1e6067ac5ea11a931a9668604d5bb554 /indra/newview/llappearancemgr.cpp | |
| parent | 550ff94d6a30367c3ea3d2c597b9fea2911039c8 (diff) | |
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.
Diffstat (limited to 'indra/newview/llappearancemgr.cpp')
| -rwxr-xr-x | indra/newview/llappearancemgr.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
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; |