summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorybridge.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2009-12-09 15:50:40 -0500
committerLoren Shih <seraph@lindenlab.com>2009-12-09 15:50:40 -0500
commit4a7c31ee1d63db068eeef3bd2f5fc0cf61247f69 (patch)
treee72c72ae02411679cc5460b776be6265fb80bd9e /indra/newview/llinventorybridge.cpp
parentf7215a5d7cb4f6431bbd63c42617b0a3dd207ac3 (diff)
parent019fc578550fd93eb404dd1ddab2b629bd0688fe (diff)
avp->avp merge
--HG-- branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
-rw-r--r--indra/newview/llinventorybridge.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index ea47013781..3746e9cfeb 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -2280,7 +2280,7 @@ bool LLFolderBridge::removeItemResponse(const LLSD& notification, const LLSD& re
iter != descendent_items.end();
++iter)
{
- const LLInventoryItem* item = (*iter);
+ const LLViewerInventoryItem* item = (*iter);
const LLUUID& item_id = item->getUUID();
if (item->getType() == LLAssetType::AT_GESTURE
&& LLGestureManager::instance().isGestureActive(item_id))