summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2018-05-03 14:59:29 -0700
committerRider Linden <rider@lindenlab.com>2018-05-03 14:59:29 -0700
commit3e33fc9130cdd5dc63cc6cc7b9f0e38b6e552f12 (patch)
tree3e0e61c308187eb7857a4631f822acafbe488207 /indra/newview/skins/default
parent03da2bc1a1c7674514c967b0e7408258dba25d77 (diff)
Inventory context menus and increment attrib for settings panels.
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/menu_inventory.xml29
-rw-r--r--indra/newview/skins/default/xui/en/menu_inventory_add.xml29
-rw-r--r--indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml6
-rw-r--r--indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml10
-rw-r--r--indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml3
-rw-r--r--indra/newview/skins/default/xui/en/panel_settings_water.xml9
-rw-r--r--indra/newview/skins/default/xui/en/strings.xml5
7 files changed, 91 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 5b45364127..29915788f1 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -322,6 +322,35 @@
</menu_item_call>
</menu>
<menu
+ label="New Settings"
+ layout="topleft"
+ name="New Settings">
+ <menu_item_call
+ label="New Sky"
+ layout="topleft"
+ name="New Sky">
+ <menu_item_call.on_click
+ function="Inventory.DoCreate"
+ parameter="sky"/>
+ </menu_item_call>
+ <menu_item_call
+ label="New Water"
+ layout="topleft"
+ name="New Water">
+ <menu_item_call.on_click
+ function="Inventory.DoCreate"
+ parameter="water"/>
+ </menu_item_call>
+ <menu_item_call
+ label="New Day Cycle"
+ layout="topleft"
+ name="New Day Cycle">
+ <menu_item_call.on_click
+ function="Inventory.DoCreate"
+ parameter="daycycle"/>
+ </menu_item_call>
+ </menu>
+ <menu
label="Use as default for"
layout="topleft"
name="upload_def">
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_add.xml b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
index afeb1bf226..7c31bfe54d 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
@@ -245,4 +245,33 @@
parameter="eyes" />
</menu_item_call>
</menu>
+ <menu
+ label="New Settings"
+ layout="topleft"
+ name="New Settings">
+ <menu_item_call
+ label="New Sky"
+ layout="topleft"
+ name="New Sky">
+ <menu_item_call.on_click
+ function="Inventory.DoCreate"
+ parameter="sky"/>
+ </menu_item_call>
+ <menu_item_call
+ label="New Water"
+ layout="topleft"
+ name="New Water">
+ <menu_item_call.on_click
+ function="Inventory.DoCreate"
+ parameter="water"/>
+ </menu_item_call>
+ <menu_item_call
+ label="New Day Cycle"
+ layout="topleft"
+ name="New Day Cycle">
+ <menu_item_call.on_click
+ function="Inventory.DoCreate"
+ parameter="daycycle"/>
+ </menu_item_call>
+ </menu>
</menu> \ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
index 643994b6b1..ffa7df209b 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
@@ -113,6 +113,7 @@
decimal_digits="2"
follows="left|top"
height="10"
+ increment="0.01"
initial_value="0"
layout="topleft"
left_delta="5"
@@ -134,6 +135,7 @@
decimal_digits="2"
follows="left|top"
height="10"
+ increment="0.01"
initial_value="0"
layout="topleft"
left_delta="5"
@@ -155,6 +157,7 @@
decimal_digits="2"
follows="left|top"
height="10"
+ increment="0.01"
initial_value="0"
layout="topleft"
left_delta="5"
@@ -183,6 +186,7 @@
decimal_digits="2"
follows="left|top"
height="10"
+ increment="0.01"
initial_value="0"
layout="topleft"
left_delta="5"
@@ -204,6 +208,7 @@
decimal_digits="2"
follows="left|top"
height="10"
+ increment="0.01"
initial_value="0"
layout="topleft"
left_delta="5"
@@ -225,6 +230,7 @@
decimal_digits="1"
follows="left|top"
height="10"
+ increment="0.01"
initial_value="0"
layout="topleft"
left_delta="5"
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
index 2a52f1a96e..b88ac64323 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
@@ -54,6 +54,7 @@
decimal_digits="2"
follows="left|top"
height="10"
+ increment="0.01"
initial_value="0"
layout="topleft"
left_delta="5"
@@ -75,6 +76,7 @@
decimal_digits="2"
follows="left|top"
height="10"
+ increment="0.01"
initial_value="0"
layout="topleft"
left_delta="5"
@@ -107,6 +109,7 @@
<slider
decimal_digits="1"
follows="left|top"
+ increment="0.01"
initial_value="0"
layout="topleft"
label="X:"
@@ -119,6 +122,7 @@
<slider
decimal_digits="1"
follows="left|top"
+ increment="0.01"
initial_value="0"
layout="topleft"
label="Y:"
@@ -168,6 +172,7 @@
decimal_digits="2"
follows="left|top"
height="10"
+ increment="0.01"
initial_value="0"
layout="topleft"
left_delta="5"
@@ -181,6 +186,7 @@
decimal_digits="2"
follows="left|top"
height="10"
+ increment="0.01"
initial_value="0"
layout="topleft"
left_delta="0"
@@ -194,6 +200,7 @@
decimal_digits="2"
follows="left|top"
height="10"
+ increment="0.01"
initial_value="0"
layout="topleft"
left_delta="0"
@@ -216,6 +223,7 @@
decimal_digits="2"
follows="left|top"
height="10"
+ increment="0.01"
initial_value="0"
layout="topleft"
left_delta="5"
@@ -229,6 +237,7 @@
decimal_digits="2"
follows="left|top"
height="10"
+ increment="0.01"
initial_value="0"
layout="topleft"
left_delta="0"
@@ -242,6 +251,7 @@
decimal_digits="2"
follows="left|top"
height="10"
+ increment="0.01"
initial_value="0"
layout="topleft"
left_delta="0"
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
index c0bd123fbc..0eb4e5be94 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
@@ -53,6 +53,7 @@
decimal_digits="2"
follows="left|top"
height="10"
+ increment="0.01"
initial_value="0"
layout="topleft"
left_delta="5"
@@ -74,6 +75,7 @@
decimal_digits="2"
follows="left|top"
height="10"
+ increment="0.01"
initial_value="0"
layout="topleft"
left_delta="5"
@@ -95,6 +97,7 @@
decimal_digits="2"
follows="left|top"
height="10"
+ increment="0.01"
initial_value="0"
layout="topleft"
left_delta="5"
diff --git a/indra/newview/skins/default/xui/en/panel_settings_water.xml b/indra/newview/skins/default/xui/en/panel_settings_water.xml
index fe088d98cf..eb4664616e 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_water.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_water.xml
@@ -63,6 +63,7 @@
decimal_digits="1"
follows="left|top|right"
height="10"
+ increment="0.01"
initial_value="0"
layout="top"
left_delta="15"
@@ -81,6 +82,7 @@
decimal_digits="1"
follows="left|top|right"
height="10"
+ increment="0.01"
initial_value="0"
layout="top"
left_delta="15"
@@ -158,6 +160,7 @@
<slider
decimal_digits="1"
follows="left|top"
+ increment="0.01"
initial_value="0"
layout="topleft"
label="X:"
@@ -170,6 +173,7 @@
<slider
decimal_digits="1"
follows="left|top"
+ increment="0.01"
initial_value="0"
layout="topleft"
label="Y:"
@@ -205,6 +209,7 @@
<slider
decimal_digits="1"
follows="left|top"
+ increment="0.01"
initial_value="0"
layout="topleft"
label="X:"
@@ -217,6 +222,7 @@
<slider
decimal_digits="1"
follows="left|top"
+ increment="0.01"
initial_value="0"
layout="topleft"
label="Y:"
@@ -241,6 +247,7 @@
<slider
decimal_digits="1"
follows="left|top"
+ increment="0.01"
initial_value="0.7"
layout="topleft"
label="X:"
@@ -252,6 +259,7 @@
<slider
decimal_digits="1"
follows="left|top"
+ increment="0.01"
initial_value="0.7"
layout="topleft"
max_val="10"
@@ -262,6 +270,7 @@
<slider
decimal_digits="1"
follows="left|top"
+ increment="0.01"
initial_value="0.7"
layout="topleft"
max_val="10"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 5f30a7e87d..55a871d120 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3850,6 +3850,11 @@ Abuse Report</string>
<string name="Female - Shrug">Female - Shrug</string>
<string name="Female - Stick tougue out">Female - Stick tongue out</string>
<string name="Female - Wow">Female - Wow</string>
+ <!-- settings -->
+ <string name="New Daycycle">New Daycycle</string>
+ <string name="New Water">New Water</string>
+ <string name="New Sky">New Sky</string>
+
<string name="/bow">/bow</string>
<string name="/clap">/clap</string>