summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorypanel.cpp
diff options
context:
space:
mode:
authorGilbert Gonzales <gilbert@lindenlab.com>2012-10-01 14:01:00 -0700
committerGilbert Gonzales <gilbert@lindenlab.com>2012-10-01 14:01:00 -0700
commitc179c687db4caba0d88a7be9e04c47d7f0e1952a (patch)
treed0819729d56d5221bb4829f8bf36c9e343ba74c5 /indra/newview/llinventorypanel.cpp
parent8e1a9e2813da6b9d5c17795b375098fb6a386ee1 (diff)
parentd54eded93ba270402349f5f337bbe12339255ece (diff)
merging in latest changes
Diffstat (limited to 'indra/newview/llinventorypanel.cpp')
-rw-r--r--indra/newview/llinventorypanel.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 6e692adf2a..a8d99ad7de 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -442,8 +442,9 @@ void LLInventoryPanel::modelChanged(U32 mask)
handled = true;
if (model_item && view_item && viewmodel_item)
{
+ const LLUUID& idp = viewmodel_item->getUUID();
view_item->destroyView();
- removeItemID(viewmodel_item->getUUID());
+ removeItemID(idp);
}
view_item = buildNewViews(item_id);
viewmodel_item =