diff options
| -rw-r--r-- | indra/llinventory/llinventory.cpp | 6 | ||||
| -rw-r--r-- | indra/llinventory/llinventory.h | 2 | ||||
| -rw-r--r-- | indra/newview/llinventorymodel.cpp | 2 |
3 files changed, 3 insertions, 7 deletions
diff --git a/indra/llinventory/llinventory.cpp b/indra/llinventory/llinventory.cpp index 13a496b4d7..5adf1fa0e6 100644 --- a/indra/llinventory/llinventory.cpp +++ b/indra/llinventory/llinventory.cpp @@ -1132,7 +1132,7 @@ LLSD LLInventoryCategory::asLLSD() const return sd; } -LLSD LLInventoryCategory::asAISLLSD() const +LLSD LLInventoryCategory::asAISCreateCatLLSD() const { LLSD sd = LLSD(); sd[INV_FOLDER_ID_LABEL_WS] = mUUID; @@ -1144,10 +1144,6 @@ LLSD LLInventoryCategory::asAISLLSD() const { sd[INV_THUMBNAIL_LABEL] = LLSD().with(INV_ASSET_ID_LABEL, mThumbnailUUID); } - else - { - sd[INV_THUMBNAIL_LABEL] = LLSD(); - } return sd; } diff --git a/indra/llinventory/llinventory.h b/indra/llinventory/llinventory.h index 516cfc6a24..6d4535af27 100644 --- a/indra/llinventory/llinventory.h +++ b/indra/llinventory/llinventory.h @@ -253,7 +253,7 @@ public: LLFolderType::EType getPreferredType() const; void setPreferredType(LLFolderType::EType type); LLSD asLLSD() const; - LLSD asAISLLSD() const; + LLSD asAISCreateCatLLSD() const; bool fromLLSD(const LLSD& sd); //-------------------------------------------------------------------- diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp index a41ab4eec3..ea771661ec 100644 --- a/indra/newview/llinventorymodel.cpp +++ b/indra/newview/llinventorymodel.cpp @@ -1029,7 +1029,7 @@ void LLInventoryModel::createNewCategory(const LLUUID& parent_id, new_inventory["categories"] = LLSD::emptyArray(); LLViewerInventoryCategory cat(LLUUID::null, parent_id, preferred_type, name, gAgent.getID()); cat.setThumbnailUUID(thumbnail_id); - LLSD cat_sd = cat.asAISLLSD(); + LLSD cat_sd = cat.asAISCreateCatLLSD(); new_inventory["categories"].append(cat_sd); AISAPI::CreateInventory( parent_id, |