summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorMaxim Nikolenko <maximnproductengine@lindenlab.com>2023-05-16 22:36:26 +0300
committerMaxim Nikolenko <maximnproductengine@lindenlab.com>2023-05-16 22:36:26 +0300
commit86fc10f710ced7d2e7b1ddf01eef945aafd60e8b (patch)
tree1aae7ced7024f258ce7b6c3baf66f34e73f4caf2 /indra/newview
parent55fb718598b474680ab66cdc667a9e779fb7807a (diff)
SL-19717 don't open new floater when taking an object from in-world or copying content
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llviewermessage.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index b359ef6df4..3adb5db3bc 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -1539,7 +1539,7 @@ void open_inventory_offer(const uuid_vec_t& objects, const std::string& from_nam
////////////////////////////////////////////////////////////////////////////////
static LLUICachedControl<bool> find_original_new_floater("FindOriginalOpenWindow", false);
//show in a new single-folder window
- if(find_original_new_floater)
+ if(find_original_new_floater && !from_name.empty())
{
const LLInventoryObject *obj = gInventory.getObject(obj_id);
if (obj && obj->getParentUUID().notNull())