diff options
| author | simon <simon@lindenlab.com> | 2024-01-03 01:34:58 +0000 |
|---|---|---|
| committer | simon <simon@lindenlab.com> | 2024-01-03 01:34:58 +0000 |
| commit | 520f710cd6b5826403383f8c3488a94c64ac8081 (patch) | |
| tree | 3936a248d991e11b82768ff10a5079789299bb53 /indra/newview/llviewerobject.cpp | |
| parent | d4c3300f9b81296f765c83c1e822251e86d91925 (diff) | |
| parent | a592292242e29d0379ee72572a434359e1e892d1 (diff) | |
Merge remote-tracking branch 'origin/main' into simon/sl-20635-new-data
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index c5d4c6dc09..2669c956e1 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -3363,6 +3363,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); |