diff options
| author | Rider Linden <rider@lindenlab.com> | 2019-08-26 14:20:59 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2019-08-26 14:20:59 -0700 |
| commit | f79fc96d08e37f119653f7db5a299a05454ff79c (patch) | |
| tree | 0e2f91f24fd2096ab5a640003a41f781d124bc16 /indra | |
| parent | 00eddaf23fbe6761e6a78500b42d076f7a1551fa (diff) | |
SL-11706: Correctly load settings when pushing the Load button in the fixed environment editor.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfloaterfixedenvironment.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/indra/newview/llfloaterfixedenvironment.cpp b/indra/newview/llfloaterfixedenvironment.cpp index dccfca62a4..f564dce629 100644 --- a/indra/newview/llfloaterfixedenvironment.cpp +++ b/indra/newview/llfloaterfixedenvironment.cpp @@ -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) |