summaryrefslogtreecommitdiff
path: root/indra/newview/llagentwearables.cpp
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2016-01-15 13:36:38 -0800
committerRider Linden <rider@lindenlab.com>2016-01-15 13:36:38 -0800
commite7eaa94dfa1eba24cbf1667190a0be37b2f417e4 (patch)
tree9e9db05ef4d37698a7fa5f68149f724aa569528d /indra/newview/llagentwearables.cpp
parent34fe371bfdeb6fc83818c58660c038c372c0f64a (diff)
parent5a5c023e291990a463b1a91846ce82c70da8daab (diff)
Merge VR
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;
}