summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2023-01-20 00:15:42 +0200
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2023-01-20 00:22:18 +0200
commit4c364dc07ed7d2726bf95101e6d14b2bd95939c3 (patch)
treea4fa805e0109a6104891a997aaed156b2578c00e /indra/newview/llappviewer.cpp
parent472ecc8088233168b25f60a100403d9c4ab832b1 (diff)
SL-14318 MacOS __write_nocancel crash
Multiple instances of viewer could write to the same uuid.inv file at the same time.
Diffstat (limited to 'indra/newview/llappviewer.cpp')
-rw-r--r--indra/newview/llappviewer.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 8af5fdfc93..d9d89efee7 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -5474,7 +5474,8 @@ void LLAppViewer::disconnectViewer()
{
gInventory.cache(gInventory.getRootFolderID(), gAgent.getID());
if (gInventory.getLibraryRootFolderID().notNull()
- && gInventory.getLibraryOwnerID().notNull())
+ && gInventory.getLibraryOwnerID().notNull()
+ && !mSecondInstance) // agent is unique, library isn't
{
gInventory.cache(
gInventory.getLibraryRootFolderID(),