diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-08-22 21:14:06 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-08-22 21:14:06 +0300 |
| commit | 4b5b048cb6280cbd9fd303acd96fce73461d1fb4 (patch) | |
| tree | e4b1e3abef1ee690b41ed7244e7aa4191abf1031 /indra | |
| parent | d882609973c0430f4cad5d09d1e9571d585578a8 (diff) | |
SL-20187 [AIS3] Don't fill thumbnail field if null thumbnail is set
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llinventory/llinventory.cpp | 9 | ||||
| -rw-r--r-- | indra/newview/llfloaterchangeitemthumbnail.cpp | 12 |
2 files changed, 18 insertions, 3 deletions
diff --git a/indra/llinventory/llinventory.cpp b/indra/llinventory/llinventory.cpp index f0b593bba7..13a496b4d7 100644 --- a/indra/llinventory/llinventory.cpp +++ b/indra/llinventory/llinventory.cpp @@ -1140,7 +1140,14 @@ LLSD LLInventoryCategory::asAISLLSD() const S8 type = static_cast<S8>(mPreferredType); sd[INV_ASSET_TYPE_LABEL_WS] = type; sd[INV_NAME_LABEL] = mName; - sd[INV_THUMBNAIL_LABEL] = LLSD().with(INV_ASSET_ID_LABEL, mThumbnailUUID); + if (mThumbnailUUID.notNull()) + { + sd[INV_THUMBNAIL_LABEL] = LLSD().with(INV_ASSET_ID_LABEL, mThumbnailUUID); + } + else + { + sd[INV_THUMBNAIL_LABEL] = LLSD(); + } return sd; } diff --git a/indra/newview/llfloaterchangeitemthumbnail.cpp b/indra/newview/llfloaterchangeitemthumbnail.cpp index 692ef3b163..77212507ab 100644 --- a/indra/newview/llfloaterchangeitemthumbnail.cpp +++ b/indra/newview/llfloaterchangeitemthumbnail.cpp @@ -787,8 +787,16 @@ void LLFloaterChangeItemThumbnail::setThumbnailId(const LLUUID& new_thumbnail_id if (obj->getThumbnailUUID() != new_thumbnail_id) { LLSD updates; - // At the moment server expects id as a string - updates["thumbnail"] = LLSD().with("asset_id", new_thumbnail_id.asString()); + if (new_thumbnail_id.notNull()) + { + // At the moment server expects id as a string + updates["thumbnail"] = LLSD().with("asset_id", new_thumbnail_id.asString()); + } + else + { + // No thumbnail isntead of 'null id thumbnail' + updates["thumbnail"] = LLSD(); + } LLViewerInventoryCategory* view_folder = dynamic_cast<LLViewerInventoryCategory*>(obj); if (view_folder) { |