diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-03-02 00:47:08 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-03-02 00:47:08 +0200 |
| commit | af9069edbff9df73cd75753b696aabd1ae8769b5 (patch) | |
| tree | 123661ba69903fccccb1501f97c05ce2c1c73411 /indra/newview/llinventorymodel.cpp | |
| parent | 723e0b2e6bfa348e6270677b1745ad29311a19c1 (diff) | |
| parent | f8c76535a35aaf245e261357a59e977bac5b2501 (diff) | |
Merged in lindenlab/viewer-release
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()); |