diff options
author | Glenn Glazer <coyot@lindenlab.com> | 2016-03-08 13:32:28 -0800 |
---|---|---|
committer | Glenn Glazer <coyot@lindenlab.com> | 2016-03-08 13:32:28 -0800 |
commit | ec683bb9cf6688633d8bc7ecbdf72f7cbc14d349 (patch) | |
tree | 59ada405958cd7764a96cfa35ccc89e83706b5af /indra/newview/llagentwearables.cpp | |
parent | daf8b882a12cf903d180f6303065d7b83f7a1958 (diff) | |
parent | 5a5c023e291990a463b1a91846ce82c70da8daab (diff) |
pull from trunk
Diffstat (limited to 'indra/newview/llagentwearables.cpp')
-rwxr-xr-x | indra/newview/llagentwearables.cpp | 4 |
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; } |