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

SL-11706: Correctly load settings when pushing the Load button in the fixed environment editor.

meow-7.2.2
Rider Linden 2019-08-26 14:20:59 -07:00
parent 00eddaf23f
commit f79fc96d08
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
indra/newview/llfloaterfixedenvironment.cpp
View File

@ -321,11 +321,16 @@ void LLFloaterFixedEnvironment::checkAndConfirmSettingsLoss(LLFloaterFixedEnviro
void LLFloaterFixedEnvironment::onPickerCommitSetting(LLUUID item_id)
{
mInventoryId = item_id;
mInventoryItem = gInventory.getItem(mInventoryId);
LLSettingsVOBase::getSettingsAsset(mInventoryItem->getAssetUUID(),
[this](LLUUID asset_id, LLSettingsBase::ptr_t settings, S32 status, LLExtStat) { onAssetLoaded(asset_id, settings, status); });
loadInventoryItem(item_id);
// mInventoryId = item_id;
// mInventoryItem = gInventory.getItem(mInventoryId);
//
// mCanCopy = mInventoryItem->getPermissions().allowCopyBy(gAgent.getID());
// mCanMod = mInventoryItem->getPermissions().allowModifyBy(gAgent.getID());
// mCanTrans = mInventoryItem->getPermissions().allowOperationBy(PERM_TRANSFER, gAgent.getID());
//
// LLSettingsVOBase::getSettingsAsset(mInventoryItem->getAssetUUID(),
// [this](LLUUID asset_id, LLSettingsBase::ptr_t settings, S32 status, LLExtStat) { onAssetLoaded(asset_id, settings, status); });
}
void LLFloaterFixedEnvironment::onAssetLoaded(LLUUID asset_id, LLSettingsBase::ptr_t settings, S32 status)