diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-03-29 12:30:09 -0400 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-03-29 12:30:09 -0400 |
commit | b6e7850c0a3d65ed0a1501e19a1655055000e32f (patch) | |
tree | 553d336a12691fb1c1caebc0e1979fc3567b02b7 /indra/newview/llinventoryfunctions.cpp | |
parent | 58d76a9ecf83b49e42fabfada27ca20814f93cf3 (diff) | |
parent | b2a667b7222640a384cb23763b32f8746b0c8cd8 (diff) |
Merge
Diffstat (limited to 'indra/newview/llinventoryfunctions.cpp')
-rw-r--r-- | indra/newview/llinventoryfunctions.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp index 1750dd79ac..1e0abeadf1 100644 --- a/indra/newview/llinventoryfunctions.cpp +++ b/indra/newview/llinventoryfunctions.cpp @@ -362,7 +362,7 @@ BOOL get_is_item_worn(const LLUUID& id) return TRUE; break; case LLAssetType::AT_GESTURE: - if (LLGestureManager::instance().isGestureActive(item->getLinkedUUID())) + if (LLGestureMgr::instance().isGestureActive(item->getLinkedUUID())) return TRUE; break; default: |