summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2019-01-08 23:16:23 +0000
committerRider Linden <rider@lindenlab.com>2019-01-08 23:16:23 +0000
commitf70ab53530774df73d00215abc51db30e1d542a5 (patch)
tree48db7c2151e201fbbb8e5599eb1e6e832775be47 /indra/newview/skins/default/xui
parentf2dbca8c5d878262f572160635f5ab681141debc (diff)
parentac85669c67be03bfb77f81e9bf51e7f1d4d6ee78 (diff)
Merged in andreykproductengine/maint-eep (pull request #220)
SL-10060 EEP Add reset default sky altitudes functionality
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r--indra/newview/skins/default/xui/en/panel_region_environment.xml10
1 files changed, 10 insertions, 0 deletions
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 eac444c971..a39973fe3a 100644
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -203,6 +203,16 @@
tool_tip="Drag a setting from Inventory onto this target box to select it as current water."
width="155" />
</panel>
+ <button
+ follows="top|left"
+ layout="topleft"
+ height="23"
+ width="100"
+ label="Reset"
+ left_pad="-90"
+ top_pad="4"
+ tool_tip="Reset to default altitudes"
+ name="btn_rst_altitudes" />
<panel
follows="top|left"
height="21"