livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-20199 Error creating new folder

master
Andrey Kleshchev 2023-08-25 19:26:58 +03:00
parent 3d73a10da3
commit c382d4e975
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/llinventory/llinventory.cpp
View File

@ -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;
}

2
indra/llinventory/llinventory.h
View File

@ -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);
//--------------------------------------------------------------------

2
indra/newview/llinventorymodel.cpp
View File

@ -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,