summaryrefslogtreecommitdiff
path: root/indra/newview/llagentwearables.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2016-01-15 16:42:39 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2016-01-15 16:42:39 -0500
commit3612d7d14b1e481402bb3d7cbfb552cd19a3fc0a (patch)
treef3dabe49f7953e24de207a6a0939da5539d5acca /indra/newview/llagentwearables.cpp
parenta6c8de97bbb2609d24e212672b192650aed91e1e (diff)
parent5a5c023e291990a463b1a91846ce82c70da8daab (diff)
merge
Diffstat (limited to 'indra/newview/llagentwearables.cpp')
-rwxr-xr-xindra/newview/llagentwearables.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp
index cce1eb5895..b76a66ab39 100755
--- a/indra/newview/llagentwearables.cpp
+++ b/indra/newview/llagentwearables.cpp
@@ -1043,7 +1043,7 @@ void LLAgentWearables::setWearableOutfit(const LLInventoryItem::item_array_t& it
if (mismatched == 0 && !update_inventory)
{
LL_DEBUGS("Avatar") << "no changes, bailing out" << LL_ENDL;
- mCOFChangeInProgress = false;
+ notifyLoadingFinished();
return;
}
@@ -1100,7 +1100,7 @@ void LLAgentWearables::setWearableOutfit(const LLInventoryItem::item_array_t& it
if (mismatched == 0)
{
LL_DEBUGS("Avatar") << "inventory updated, wearable assets not changed, bailing out" << LL_ENDL;
- mCOFChangeInProgress = false;
+ notifyLoadingFinished();
return;
}