summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorGraham Madarasz <graham@lindenlab.com>2019-05-28 16:23:56 +0000
committerGraham Madarasz <graham@lindenlab.com>2019-05-28 16:23:56 +0000
commitee229e0f0b64de1a8b5020788141aa47bcaa938a (patch)
treec9057416ac0de59a51c9e53152009239f164c515 /indra/newview/skins/default
parent6aa393f7f50ca30b65391f4ae230a3357092f3cd (diff)
parentfdf0d49614b820ffa85d2aa9258e4592bc0e45f3 (diff)
Merged in maxim_productengine/viewer-eep (pull request #406)
SL-11279 and SL-11273 fixes
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml2
1 files changed, 2 insertions, 0 deletions
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 bbba5ba729..0e3de821d1 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
@@ -21,6 +21,7 @@
auto_resize="true"
user_resize="false"
visible="true"
+ name="sun_layout"
height="400">
<text
follows="left|top"
@@ -209,6 +210,7 @@
auto_resize="true"
user_resize="false"
visible="true"
+ name="moon_layout"
height="220">
<text
follows="left|top"