diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-07-22 19:01:52 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-07-22 19:01:52 +0000 |
| commit | 0c0391cc7114bd2e9e4462c40e88814326f61bc2 (patch) | |
| tree | 2906124fe8371b6336e6f7231cd890d267a75d6d /indra/newview/llinventorymodel.cpp | |
| parent | ed386ae547c225e352c39e8d14921572ee534b0b (diff) | |
QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release
merge Branch_1-20-14-Viewer-merge -> release
Includes Branch_1-20-Viewer-2 through 92456
Diffstat (limited to 'indra/newview/llinventorymodel.cpp')
| -rw-r--r-- | indra/newview/llinventorymodel.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp index 01b2942a37..c05eea7bd8 100644 --- a/indra/newview/llinventorymodel.cpp +++ b/indra/newview/llinventorymodel.cpp @@ -111,6 +111,7 @@ const char* NEW_CATEGORY_NAMES[LLAssetType::AT_COUNT] = "Uncompressed Images", // AT_IMAGE_JPEG "Animations", // AT_ANIMATION "Gestures", // AT_GESTURE + "New Folder" // AT_SIMSTATE }; struct InventoryIDPtrLess @@ -352,6 +353,12 @@ LLUUID LLInventoryModel::createNewCategory(const LLUUID& parent_id, return id; } + if(preferred_type == LLAssetType::AT_SIMSTATE) + { + lldebugs << "Attempt to create simstate category." << llendl; + return id; + } + id.generate(); std::string name = pname; if(!pname.empty()) @@ -359,7 +366,7 @@ LLUUID LLInventoryModel::createNewCategory(const LLUUID& parent_id, name.assign(pname); } else if((preferred_type >= LLAssetType::AT_TEXTURE) && - (preferred_type < LLAssetType::AT_COUNT)) + (preferred_type < LLAssetType::AT_SIMSTATE)) { name.assign(NEW_CATEGORY_NAMES[preferred_type]); } |