summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerobject.cpp
diff options
context:
space:
mode:
authorBrad Linden <brad@lindenlab.com>2023-12-14 12:07:18 -0800
committerBrad Linden <brad@lindenlab.com>2023-12-14 12:07:18 -0800
commit4c791e098d3abafa406e0e269038c40aae67f66c (patch)
treed566be04939faf3dc29655a8113afc067b2b7c99 /indra/newview/llviewerobject.cpp
parentc74dbc6e5b117bcd020c0efecf5255ad731f310f (diff)
parenta592292242e29d0379ee72572a434359e1e892d1 (diff)
Merge remote-tracking branch 'origin/main' into DRTVWR-596
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
-rw-r--r--indra/newview/llviewerobject.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 2bcd0858d3..d4346ee2d9 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -3485,6 +3485,12 @@ void LLViewerObject::doInventoryCallback()
void LLViewerObject::removeInventory(const LLUUID& item_id)
{
+ // close associated floater properties
+ LLSD params;
+ params["id"] = item_id;
+ params["object"] = mID;
+ LLFloaterReg::hideInstance("item_properties", params);
+
LLMessageSystem* msg = gMessageSystem;
msg->newMessageFast(_PREHASH_RemoveTaskInventory);
msg->nextBlockFast(_PREHASH_AgentData);