diff options
author | Graham Madarasz <graham@lindenlab.com> | 2018-03-06 09:48:44 -0800 |
---|---|---|
committer | Graham Madarasz <graham@lindenlab.com> | 2018-03-06 09:48:44 -0800 |
commit | b9016f99f3abf8b135942e60a5a2d8cd8f0f4e75 (patch) | |
tree | 7e0dc18306309254b5d8cd5f40ac6ce897409242 /indra/newview/llinventorymodel.cpp | |
parent | f8134b152d1a7273e27a224eac11d52c0a6f94c9 (diff) | |
parent | af9069edbff9df73cd75753b696aabd1ae8769b5 (diff) |
Merged lindenlab/viewer-cougar into default
Diffstat (limited to 'indra/newview/llinventorymodel.cpp')
-rw-r--r-- | indra/newview/llinventorymodel.cpp | 5 |
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()); |