summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerobject.cpp
diff options
context:
space:
mode:
authorSignal Linden <signal@lindenlab.com>2023-11-21 08:07:20 -0800
committerGitHub <noreply@github.com>2023-11-21 08:07:20 -0800
commit5416d94d07ac85ba384fafb0b0b1b11b8cd0b6e4 (patch)
tree1c4fd503f43d628dd6223af44aa14921357ae0ab /indra/newview/llviewerobject.cpp
parent9b50c50bf2fe3fab2dbb0bcd18d7c8f5b9a13a1b (diff)
parent62c7a17604ba4faec989465a374e7ed7627ec56b (diff)
Merge branch 'DRTVWR-587-maint-V' into signal/simple-release
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 9275cfb86d..c0d569be01 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -3473,6 +3473,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);