diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2018-11-28 15:05:30 +0200 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2018-11-28 15:05:30 +0200 |
| commit | 1f1d29e3462fb0adff9342b657160441d5b992d0 (patch) | |
| tree | a034bb563e6717b17bf7560f2d4e340476753b61 | |
| parent | 9309c2c966a6df3ad6a42a1aa4d643b0bc54a71d (diff) | |
SL-9787 EEP Remove Apply to Region from right-click menus.
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 13 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_inventory.xml | 7 |
2 files changed, 0 insertions, 20 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index bc953f3ed1..6a5c124108 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -6946,19 +6946,6 @@ void LLSettingsBridge::performAction(LLInventoryModel* model, std::string action LL_WARNS("LAPRAS") << "Applying asset ID " << asset_id << " to parcel " << parcel_id << LL_ENDL; LLEnvironment::instance().updateParcel(parcel_id, asset_id, name, -1, -1); } - else if ("apply_settings_region" == action) - { - // Single item only - LLViewerInventoryItem* item = static_cast<LLViewerInventoryItem*>(getItem()); - if (!item) - return; - LLUUID asset_id = item->getAssetUUID(); - std::string name = item->getName(); - - LL_WARNS("LAPRAS") << "Applyng asset id " << asset_id << " to region." << LL_ENDL; - - LLEnvironment::instance().updateRegion(asset_id, name, -1, -1); - } else LLItemBridge::performAction(model, action); } diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml index 6f04785e8c..9b24e2ffcf 100644 --- a/indra/newview/skins/default/xui/en/menu_inventory.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory.xml @@ -880,13 +880,6 @@ function="Inventory.DoToSelected" parameter="apply_settings_parcel" /> </menu_item_call> - <menu_item_call - name="Settings Apply Region" - layout="topleft" - label="Apply To Region"> - <menu_item_call.on_click - function="Inventory.DoToSelected" - parameter="apply_settings_region" /> </menu_item_call> <menu_item_separator layout="topleft" |