diff options
| author | Aimee Linden <aimee@lindenlab.com> | 2010-03-29 17:53:21 +0100 |
|---|---|---|
| committer | Aimee Linden <aimee@lindenlab.com> | 2010-03-29 17:53:21 +0100 |
| commit | eb0aaff4aac1dcf9f238242c107df650584efdf9 (patch) | |
| tree | b07b612c33f23e820492b06488a8c406856b64c8 /indra/newview/llinventoryfunctions.cpp | |
| parent | fc0906d6e8c1238fe7fd21c185957ca89511e76e (diff) | |
| parent | b6e7850c0a3d65ed0a1501e19a1655055000e32f (diff) | |
Merge
Diffstat (limited to 'indra/newview/llinventoryfunctions.cpp')
| -rw-r--r-- | indra/newview/llinventoryfunctions.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp index 3553137f53..1e0abeadf1 100644 --- a/indra/newview/llinventoryfunctions.cpp +++ b/indra/newview/llinventoryfunctions.cpp @@ -352,8 +352,7 @@ BOOL get_is_item_worn(const LLUUID& id) { case LLAssetType::AT_OBJECT: { - const LLVOAvatarSelf* my_avatar = gAgent.getAvatarObject(); - if(my_avatar && my_avatar->isWearingAttachment(item->getLinkedUUID())) + if (isAgentAvatarValid() && gAgentAvatarp->isWearingAttachment(item->getLinkedUUID())) return TRUE; break; } @@ -363,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: |