summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authormaxim_productengine <mnikolenko@productengine.com>2018-02-02 18:06:16 +0200
committermaxim_productengine <mnikolenko@productengine.com>2018-02-02 18:06:16 +0200
commit9773809f71e24ad7fbd8dcdbc43f6e355b664a4f (patch)
treec1b637c72f62f98b398a97e96364230eab7008d4 /indra/newview
parentbd786ada4f773b0ba13536f26a7858bd9ad69791 (diff)
MAINT-8262 Crash in LLInventoryModel::createNewCategory(..)
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llinventorymodel.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index 054db2a3ec..6a1ec9f991 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -617,6 +617,11 @@ LLUUID LLInventoryModel::createNewCategory(const LLUUID& parent_id,
return LLUUID::null;
}
+ if (!gMessageSystem)
+ {
+ return LLUUID::null;
+ }
+
// Add the category to the internal representation
LLPointer<LLViewerInventoryCategory> cat =
new LLViewerInventoryCategory(id, parent_id, preferred_type, name, gAgent.getID());