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

SL-19108 Disable "Image" button for task inventories 

Thumbnails are not supported for task inventories yet
meow-7.2.2
Andrey Kleshchev 2023-03-23 21:13:30 +02:00
parent 6172945775
commit 04501955c7
4 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llaisapi.cpp
View File

@ -543,7 +543,8 @@ void AISAPI::onIdle(void *userdata)
void AISAPI::onUpdateReceived(const std::string& context, const LLSD& update, COMMAND_TYPE type, const LLSD& request_body)
{
LLTimer timer;
if (gSavedSettings.getBOOL("DebugAvatarAppearanceMessage"))
if ( (type == UPDATECATEGORY || type == UPDATEITEM)
&& gSavedSettings.getBOOL("DebugAvatarAppearanceMessage"))
{
dump_sequential_xml(gAgentAvatarp->getFullname() + "_ais_update", update);
}
@ -558,7 +559,7 @@ void AISAPI::onUpdateReceived(const std::string& context, const LLSD& update, CO
}
AISUpdate ais_update(update, is_fetch, depth);
ais_update.doUpdate(); // execute the updates in the appropriate order.
LL_INFOS("Inventory") << "elapsed: " << timer.getElapsedTimeF32() << LL_ENDL;
LL_DEBUGS("Inventory") << "elapsed: " << timer.getElapsedTimeF32() << LL_ENDL;
}
/*static*/

4
indra/newview/llinventorymodel.cpp
View File

@ -3448,6 +3448,10 @@ void LLInventoryModel::processUpdateCreateInventoryItem(LLMessageSystem* msg, vo
msg->getU32Fast(_PREHASH_InventoryData, _PREHASH_CallbackID, callback_id);
gInventoryCallbacks.fire(callback_id, item_id);
// todo: instead of unpacking message fully,
// grab only an item_id, then fetch via AIS
AISAPI::FetchItem(item_id, AISAPI::INVENTORY);
}
}

8
indra/newview/llsidepaneliteminfo.cpp
View File

@ -154,15 +154,16 @@ LLSidepanelItemInfo::~LLSidepanelItemInfo()
// virtual
BOOL LLSidepanelItemInfo::postBuild()
{
mChangeThumbnailBtn = getChild<LLUICtrl>("change_thumbnail_btn");
mItemTypeIcon = getChild<LLIconCtrl>("item_type_icon");
mLabelOwnerName = getChild<LLTextBox>("LabelOwnerName");
mLabelCreatorName = getChild<LLTextBox>("LabelCreatorName");
mItemTypeIcon = getChild<LLIconCtrl>("item_type_icon");
getChild<LLLineEditor>("LabelItemName")->setPrevalidate(&LLTextValidate::validateASCIIPrintableNoPipe);
getChild<LLUICtrl>("LabelItemName")->setCommitCallback(boost::bind(&LLSidepanelItemInfo::onCommitName,this));
getChild<LLUICtrl>("LabelItemDesc")->setCommitCallback(boost::bind(&LLSidepanelItemInfo:: onCommitDescription, this));
// Thumnail edition
getChild<LLUICtrl>("change_thumbnail_btn")->setCommitCallback(boost::bind(&LLSidepanelItemInfo::onEditThumbnail, this));
mChangeThumbnailBtn->setCommitCallback(boost::bind(&LLSidepanelItemInfo::onEditThumbnail, this));
// acquired date
// owner permissions
// Permissions debug text
@ -443,6 +444,9 @@ void LLSidepanelItemInfo::refreshFromItem(LLViewerInventoryItem* item)
mLabelOwnerName->setEnabled(FALSE);
mLabelOwnerName->setValue(getString("public"));
}
// Not yet supported for task inventories
mChangeThumbnailBtn->setEnabled(mObjectID.isNull());
////////////
// ORIGIN //

5
indra/newview/llsidepaneliteminfo.h
View File

@ -100,10 +100,11 @@ private:
S32 mUpdatePendingId;
bool mIsDirty; // item properties need to be updated
LLFloater* mParentFloater;
LLUICtrl* mChangeThumbnailBtn;
LLIconCtrl* mItemTypeIcon;
LLTextBox* mLabelOwnerName;
LLTextBox* mLabelCreatorName;
LLIconCtrl* mItemTypeIcon;
//
// UI Elements