diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-06-11 11:43:50 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-06-11 11:43:50 -0700 |
| commit | 97da85de0b1e0f8c2fc60c156c31b237b869230a (patch) | |
| tree | 5dd5785e0bc9321c5e340c70ccf8c36993b948da /indra/newview/llinventorybridge.cpp | |
| parent | 8365945f8af6e27e7180b40aae79f210f99bb7c8 (diff) | |
remove legacy environmental edit floater and some lingering transition functions. Change floater environment switch behavior.
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 58f6c2065b..f1c7615efc 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -6911,7 +6911,8 @@ void LLSettingsBridge::performAction(LLInventoryModel* model, std::string action LLViewerInventoryItem* item = static_cast<LLViewerInventoryItem*>(getItem()); if (!item) return; - LLUUID asset_id = item->getProtectedAssetUUID(); + LLUUID asset_id = item->getAssetUUID(); + LL_WARNS("LAPRAS") << "Locally applying asset ID " << asset_id << LL_ENDL; LLEnvironment::instance().setEnvironment(LLEnvironment::ENV_LOCAL, asset_id); LLEnvironment::instance().setSelectedEnvironment(LLEnvironment::ENV_LOCAL); } @@ -6921,7 +6922,7 @@ void LLSettingsBridge::performAction(LLInventoryModel* model, std::string action LLViewerInventoryItem* item = static_cast<LLViewerInventoryItem*>(getItem()); if (!item) return; - LLUUID asset_id = item->getProtectedAssetUUID(); + LLUUID asset_id = item->getAssetUUID(); LLParcel *parcel = LLViewerParcelMgr::instance().getAgentParcel(); if (!parcel) @@ -6931,6 +6932,7 @@ void LLSettingsBridge::performAction(LLInventoryModel* model, std::string action } S32 parcel_id = parcel->getLocalID(); + LL_WARNS("LAPRAS") << "Applying asset ID " << asset_id << " to parcel " << parcel_id << LL_ENDL; LLEnvironment::instance().updateParcel(parcel_id, asset_id, -1, -1); } else if ("apply_settings_region" == action) @@ -6939,7 +6941,9 @@ void LLSettingsBridge::performAction(LLInventoryModel* model, std::string action LLViewerInventoryItem* item = static_cast<LLViewerInventoryItem*>(getItem()); if (!item) return; - LLUUID asset_id = item->getProtectedAssetUUID(); + LLUUID asset_id = item->getAssetUUID(); + + LL_WARNS("LAPRAS") << "Applyng asset id " << asset_id << " to region." << LL_ENDL; LLEnvironment::instance().updateRegion(asset_id, -1, -1); } |