diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-11-30 09:08:56 -0800 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-11-30 09:08:56 -0800 |
| commit | 79049c49bd34d58c3a3140d4fc50f586e45f3047 (patch) | |
| tree | bb1941153a12040abb44f66e25a4255e2f7bad54 /indra/newview/skins | |
| parent | 65d56f53cd9a2028af177ec0315b721f59868d19 (diff) | |
| parent | d66012f85e885679738cf8c488fd8ff460319c85 (diff) | |
Merge
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_inventory.xml | 8 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_region_environment.xml | 1 |
2 files changed, 1 insertions, 8 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml index 6f04785e8c..33ecb4477a 100644 --- a/indra/newview/skins/default/xui/en/menu_inventory.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory.xml @@ -880,14 +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" name="Marketplace Separator" /> diff --git a/indra/newview/skins/default/xui/en/panel_region_environment.xml b/indra/newview/skins/default/xui/en/panel_region_environment.xml index 18364bbf0b..2f91252d9b 100644 --- a/indra/newview/skins/default/xui/en/panel_region_environment.xml +++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml @@ -252,6 +252,7 @@ width="17" orientation="vertical" increment="10" + overlap_threshold="100" min_val="100" max_val="4000" layout="topleft" |