diff options
| -rw-r--r-- | indra/newview/llfloaterchangeitemthumbnail.cpp | 66 | ||||
| -rw-r--r-- | indra/newview/llfloaterchangeitemthumbnail.h | 2 |
2 files changed, 43 insertions, 25 deletions
diff --git a/indra/newview/llfloaterchangeitemthumbnail.cpp b/indra/newview/llfloaterchangeitemthumbnail.cpp index 626265fd4b..722adcc254 100644 --- a/indra/newview/llfloaterchangeitemthumbnail.cpp +++ b/indra/newview/llfloaterchangeitemthumbnail.cpp @@ -327,8 +327,7 @@ void LLFloaterChangeItemThumbnail::refreshFromObject(LLInventoryObject* obj) if (validateAsset(thumbnail_id)) { // per SL-19188, set this image as a thumbnail - cat->setThumbnailUUID(thumbnail_id); - // todo: needs to trigger send/update once server support is done + setThumbnailId(thumbnail_id); } } } @@ -430,19 +429,14 @@ void LLFloaterChangeItemThumbnail::onPasteFromClipboard(void *userdata) LLClipboard::instance().pasteFromClipboard(objects); if (objects.size() > 0) { - LLInventoryObject* obj = self->getInventoryObject(); - if (obj) + LLUUID asset_id = objects[0]; + if (validateAsset(asset_id)) { - LLUUID asset_id = objects[0]; - if (validateAsset(asset_id)) - { - obj->setThumbnailUUID(asset_id); - // todo: need to trigger send/update once server support is done - } - else - { - LLNotificationsUtil::add("ThumbnailDimantionsLimit"); - } + self->setThumbnailId(asset_id); + } + else + { + LLNotificationsUtil::add("ThumbnailDimantionsLimit"); } } } @@ -464,13 +458,7 @@ void LLFloaterChangeItemThumbnail::onRemovalConfirmation(const LLSD& notificatio if (option == 0 && !handle.isDead() && !handle.get()->isDead()) { LLFloaterChangeItemThumbnail* self = (LLFloaterChangeItemThumbnail*)handle.get(); - - LLInventoryObject* obj = self->getInventoryObject(); - if (obj) - { - obj->setThumbnailUUID(LLUUID::null); - // todo: need to trigger send/update once server support is done - } + self->setThumbnailId(LLUUID::null); } } @@ -561,15 +549,13 @@ void LLFloaterChangeItemThumbnail::showTexturePicker(const LLUUID &thumbnail_id) void LLFloaterChangeItemThumbnail::onTexturePickerCommit(LLUUID id) { LLFloaterTexturePicker* floaterp = (LLFloaterTexturePicker*)mPickerHandle.get(); - LLInventoryObject* obj = getInventoryObject(); - if (obj && floaterp) + if (floaterp) { LLUUID asset_id = floaterp->getAssetID(); if (validateAsset(asset_id)) { - obj->setThumbnailUUID(asset_id); - // todo: need to trigger send/update once server support is done + setThumbnailId(asset_id); } else { @@ -578,6 +564,36 @@ void LLFloaterChangeItemThumbnail::onTexturePickerCommit(LLUUID id) } } + +void LLFloaterChangeItemThumbnail::setThumbnailId(const LLUUID &new_thumbnail_id) +{ + LLInventoryObject* obj = getInventoryObject(); + if (!obj) + { + return; + } + + if (mTaskId.notNull()) + { + LL_ERRS() << "Not implemented yet" << LL_ENDL; + } + else if (obj->getThumbnailUUID() != new_thumbnail_id) + { + LLSD updates; + updates["thumbnail"] = LLSD().with("asset_id", new_thumbnail_id); + LLViewerInventoryCategory* view_folder = dynamic_cast<LLViewerInventoryCategory*>(obj); + if (view_folder) + { + update_inventory_category(mItemId, updates, NULL); + } + LLViewerInventoryItem* view_item = dynamic_cast<LLViewerInventoryItem*>(obj); + if (view_item) + { + update_inventory_item(mItemId, updates, NULL); + } + } +} + void LLFloaterChangeItemThumbnail::onButtonMouseEnter(LLUICtrl* button, const LLSD& param, EToolTipState state) { mTooltipState = state; diff --git a/indra/newview/llfloaterchangeitemthumbnail.h b/indra/newview/llfloaterchangeitemthumbnail.h index bc85e4be0b..50c0c951d4 100644 --- a/indra/newview/llfloaterchangeitemthumbnail.h +++ b/indra/newview/llfloaterchangeitemthumbnail.h @@ -72,6 +72,8 @@ private: void showTexturePicker(const LLUUID &thumbnail_id); void onTexturePickerCommit(LLUUID id); + void setThumbnailId(const LLUUID &new_thumbnail_id); + enum EToolTipState { TOOLTIP_NONE, |