diff options
| author | Ankur Ahlawat <anchor@lindenlab.com> | 2018-03-07 10:00:07 -0800 |
|---|---|---|
| committer | Ankur Ahlawat <anchor@lindenlab.com> | 2018-03-07 10:00:07 -0800 |
| commit | ac558e384214e22b4a8da2045854e2180b7428bf (patch) | |
| tree | 7de576ff5552cbb9956c6cdf0e4d84b52514316e /indra/newview/llinventorymodel.cpp | |
| parent | 485193c7f530fa3d8574c74304e452ab6d012e41 (diff) | |
| parent | f8c76535a35aaf245e261357a59e977bac5b2501 (diff) | |
Merged lindenlab/viewer-release 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()); |