summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorMaxim Nikolenko <maximnproductengine@lindenlab.com>2023-05-16 18:34:32 +0300
committerMaxim Nikolenko <maximnproductengine@lindenlab.com>2023-05-16 18:34:32 +0300
commit55fb718598b474680ab66cdc667a9e779fb7807a (patch)
tree2e731987cfa68fc6d87ac1df1e14d9a56459347b /indra
parent474012abd603f7e7963344fcd9d14cdc7db7bb9a (diff)
SL-19701 open shared folder instead of just selecting it
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llviewermessage.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 78241a7c71..b359ef6df4 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -1544,7 +1544,14 @@ void open_inventory_offer(const uuid_vec_t& objects, const std::string& from_nam
const LLInventoryObject *obj = gInventory.getObject(obj_id);
if (obj && obj->getParentUUID().notNull())
{
- LLPanelMainInventory::newFolderWindow(obj->getParentUUID(), obj_id);
+ if (obj->getActualType() == LLAssetType::AT_CATEGORY)
+ {
+ LLPanelMainInventory::newFolderWindow(obj_id);
+ }
+ else
+ {
+ LLPanelMainInventory::newFolderWindow(obj->getParentUUID(), obj_id);
+ }
}
}
else