diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-29 18:07:39 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-29 18:07:39 +0100 |
| commit | a85139cd7deaf87493012f6c7589f93ef40730d2 (patch) | |
| tree | 056501dbea279f8b828d3ee4231e1e2d8c86da10 /indra/newview/llassetuploadresponders.cpp | |
| parent | 6507534ad49fd1207c77d3b2f2b4cdcc4b28ee6b (diff) | |
| parent | eb0aaff4aac1dcf9f238242c107df650584efdf9 (diff) | |
merge.
Diffstat (limited to 'indra/newview/llassetuploadresponders.cpp')
| -rw-r--r-- | indra/newview/llassetuploadresponders.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llassetuploadresponders.cpp b/indra/newview/llassetuploadresponders.cpp index 2bd3728ab7..370ecc0665 100644 --- a/indra/newview/llassetuploadresponders.cpp +++ b/indra/newview/llassetuploadresponders.cpp @@ -487,10 +487,10 @@ void LLUpdateAgentInventoryResponder::uploadComplete(const LLSD& content) { // If this gesture is active, then we need to update the in-memory // active map with the new pointer. - if (LLGestureManager::instance().isGestureActive(item_id)) + if (LLGestureMgr::instance().isGestureActive(item_id)) { LLUUID asset_id = new_item->getAssetUUID(); - LLGestureManager::instance().replaceGesture(item_id, asset_id); + LLGestureMgr::instance().replaceGesture(item_id, asset_id); gInventory.notifyObservers(); } |