diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2018-03-01 19:38:21 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2018-03-01 19:38:21 -0500 |
| commit | 12ccb65603ec50ac80d85c4e023ec8e026c9e1f2 (patch) | |
| tree | f7bfc4b64718278041f46e1759f5de27c9d83864 /indra/newview/llinventorymodel.cpp | |
| parent | 2e87bac8f9983faa6a1e46ee626d688a101fa070 (diff) | |
| parent | 3c7086d4fff6c370f8ce2be51cab2502f663aab1 (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-451
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()); |