summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2018-09-17 16:41:43 +0000
committerRider Linden <rider@lindenlab.com>2018-09-17 16:41:43 +0000
commit8a65439c76437476d62b3f52fa26fea7ea1c6740 (patch)
tree5f81bc0de7e0540f48de95c987ebb2b9e9faea59 /indra/newview
parent8f44ac231921cd7b83c0b0e47fbef0b6a52a0b57 (diff)
parent59a92c8523b976512543a6d2611ff8b5da39790c (diff)
Merged in andreykproductengine/maint-eep (pull request #89)
SL-9650 EEP environment panel should not animate Approved-by: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/skins/default/xui/en/panel_region_environment.xml2
1 files changed, 2 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 3ce0d7a2ef..cfb142093a 100644
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -21,6 +21,7 @@
height="367"
follows="all"
layout="topleft"
+ animate="false"
orientation="vertical">
<layout_panel
auto_resize="true"
@@ -50,6 +51,7 @@
bottom="-1"
layout="topleft"
follows="all"
+ animate="false"
orientation="horizontal">
<layout_panel
background_visible="true"