summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerinventory.cpp
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2025-04-30 23:45:22 +0300
committerAndrey Kleshchev <117672381+akleshchev@users.noreply.github.com>2025-05-05 18:28:08 +0300
commitf73e0d09aabd17f778ce802353dea5c5aae007be (patch)
tree9bd26aee05f8981fb07c6af0c260bd85d0d36f19 /indra/newview/llviewerinventory.cpp
parent778a69c6e1783ea6c9c7ac3102990646ff2e38da (diff)
#3905 Crashes in LLInventoryModel::saveToFile
I don't expect it to fix the problem. Just making things more explicit in places of most frequent crashes.
Diffstat (limited to 'indra/newview/llviewerinventory.cpp')
-rw-r--r--indra/newview/llviewerinventory.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index 36ec6f0d78..8caa0144c3 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -751,13 +751,11 @@ S32 LLViewerInventoryCategory::getViewerDescendentCount() const
return descendents_actual;
}
-LLSD LLViewerInventoryCategory::exportLLSD() const
+void LLViewerInventoryCategory::exportLLSD(LLSD & cat_data) const
{
- LLSD cat_data = LLInventoryCategory::exportLLSD();
+ LLInventoryCategory::exportLLSD(cat_data);
cat_data[INV_OWNER_ID] = mOwnerID;
cat_data[INV_VERSION] = mVersion;
-
- return cat_data;
}
bool LLViewerInventoryCategory::importLLSD(const LLSD& cat_data)