diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-11-16 01:34:29 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-11-16 01:34:29 +0200 |
| commit | 981cdca0a5f874fb02694ae5bb39c99784762481 (patch) | |
| tree | f7001c629f918e6fff756574128cb068dd25d309 /indra/newview/skins/default | |
| parent | f9e7e59405a161828ec5dde624299b8aa67dc5b7 (diff) | |
| parent | 9957c28ddc5e5c129af2db662da7d69f1509af65 (diff) | |
Merge branch 'master' into DRTVWR-483
# Conflicts:
# indra/llui/lltextbase.h
# indra/newview/VIEWER_VERSION.txt
Diffstat (limited to 'indra/newview/skins/default')
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_inventory.xml | 8 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_preferences_move.xml | 9 |
2 files changed, 17 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml index 5a35bbf121..78ca170813 100644 --- a/indra/newview/skins/default/xui/en/menu_inventory.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory.xml @@ -815,6 +815,14 @@ function="Inventory.DoToSelected" parameter="save_as" /> </menu_item_call> + <menu_item_call + label="Save Selected As" + layout="topleft" + name="Save Selected As"> + <menu_item_call.on_click + function="Inventory.DoToSelected" + parameter="save_selected_as" /> + </menu_item_call> <menu_item_separator layout="topleft" name="Wearable And Object Separator"/> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_move.xml b/indra/newview/skins/default/xui/en/panel_preferences_move.xml index 8794e3bf95..864223e616 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_move.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml @@ -259,6 +259,15 @@ <combo_box.commit_callback function="Pref.ClickActionChange"/> </combo_box> + <check_box + control_name="EnableCollisionSounds" + height="20" + label="Play sound on collisions" + layout="topleft" + left="83" + name="sound_on_collisions" + top_pad="10" + width="200" /> <button height="23" label="Other Devices" |