diff options
| author | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-06-09 19:08:16 +0300 |
|---|---|---|
| committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-06-09 19:08:16 +0300 |
| commit | 4f34d63f3e9b2d70bd24c2f49cce98da30df050e (patch) | |
| tree | e34b76fc7ad3ac87a791fba44a0778fd3b2c8342 /indra/newview/llinventoryfunctions.cpp | |
| parent | d807db70e02c5e0d7232a1ccf134456f619c94ba (diff) | |
| parent | 4976323af8fae67a06e856bc9801635da5bfd79f (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llinventoryfunctions.cpp')
| -rw-r--r-- | indra/newview/llinventoryfunctions.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp index ca6cede7e9..c86d463a08 100644 --- a/indra/newview/llinventoryfunctions.cpp +++ b/indra/newview/llinventoryfunctions.cpp @@ -309,6 +309,11 @@ BOOL get_is_category_removable(const LLInventoryModel* model, const LLUUID& id) BOOL get_is_category_renameable(const LLInventoryModel* model, const LLUUID& id) { + if (!model) + { + return FALSE; + } + LLViewerInventoryCategory* cat = model->getCategory(id); if (cat && !LLFolderType::lookupIsProtectedType(cat->getPreferredType()) && |