Merge branch 'DRTVWR-559' into DRTVWR-583

1 files changed, 23 insertions, 1 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_adjust_environment.xml b/indra/newview/skins/default/xui/en/floater_adjust_environment.xml
index aef923feb2..5258bdbaf2 100644
--- a/indra/newview/skins/default/xui/en/floater_adjust_environment.xml
+++ b/indra/newview/skins/default/xui/en/floater_adjust_environment.xml
@@ -33,6 +33,7 @@
                           animate="false"
                           orientation="horizontal">
                 <layout_panel border="false"
+                              name="lp_1"
                               bevel_style="in"
                               auto_resize="false"
                               user_resize="false"
@@ -40,6 +41,7 @@
                               width="160"
                               height="150">
                     <text follows="left|top"
+                          name="ambient_lbl"
                           height="10"
                           layout="topleft"
                           left="10"
@@ -55,6 +57,7 @@
                                   top_pad="5"
                                   width="60"/>
                     <text follows="left|top"
+                          name="blue_horizon_lbl"
                           height="10"
                           layout="topleft"
                           left_delta="0"
@@ -70,6 +73,7 @@
                                   top_pad="5"
                                   width="60"/>
                     <text follows="left|top"
+                          name="blue_density_lbl"
                           height="10"
                           layout="topleft"
                           left_delta="0"
@@ -95,6 +99,7 @@
                       top_pad="10"
                       width="100"/>
                     <text follows="right|top"
+                          name="sun_color_lbl"
                           height="10"
                           layout="topleft"
                           right="-12"
@@ -110,6 +115,7 @@
                                   top_pad="5"
                                   width="60"/>
                     <text follows="left|top"
+                          name="cloud_color_lbl"
                           height="10"
                           layout="topleft"
                           left_delta="0"
@@ -142,7 +148,7 @@
                           layout="topleft"
                           left_delta="0"
                           top_pad="-13"
-                          name="cloud_map_label"
+                          name="water_map_label"
                           width="80">Water Image:</text>
                     <texture_picker height="63"
                                     layout="topleft"
@@ -152,6 +158,7 @@
                                     width="60"/>
                 </layout_panel>
                 <layout_panel border="false"
+                              name="lp_2"
                               bevel_style="in"
                               auto_resize="false"
                               user_resize="false"
@@ -159,6 +166,7 @@
                               width="200"
                               height="150">
                     <text follows="left|top"
+                          name="haze_horizon_label"
                           height="10"
                           layout="topleft"
                           left_delta="5"
@@ -178,6 +186,7 @@
                             width="185"
                             can_edit_text="true"/>
                     <text follows="left|top"
+                          name="haze_density_label"
                           height="10"
                           layout="topleft"
                           left_delta="-5"
@@ -197,6 +206,7 @@
                             width="185"
                             can_edit_text="true"/>
                     <text follows="left|top"
+                          name="cloud_coverage_label"
                           height="10"
                           layout="topleft"
                           left_delta="-5"
@@ -216,6 +226,7 @@
                             width="185"
                             can_edit_text="true"/>
                     <text follows="left|top"
+                          name="cloud_scale_label"
                           height="10"
                           layout="topleft"
                           left_delta="-5"
@@ -235,6 +246,7 @@
                             width="185"
                             can_edit_text="true"/>
                     <text follows="left|top"
+                          name="scene_gamma_label"
                           height="10"
                           layout="topleft"
                           left_delta="-5"
@@ -273,6 +285,7 @@
                           can_edit_text="true"/>
                 </layout_panel>
                 <layout_panel border="false"
+                              name="lp_3"
                               bevel_style="in"
                               auto_resize="false"
                               user_resize="false"
@@ -296,6 +309,7 @@
                                         width="150"
                                         thumb_mode="sun"/>
                   <text follows="left|top"
+                        name="sun_azimuth_label"
                         height="10"
                         layout="topleft"
                         left_delta="0"
@@ -315,6 +329,7 @@
                           width="130"
                           can_edit_text="true"/>
                   <text follows="left|top"
+                        name="sun_elevation_label"
                         height="10"
                         layout="topleft"
                         left_delta="-5"
@@ -343,6 +358,7 @@
                                top_pad="8"
                                follows="left|top"/>
                     <text follows="left|top"
+                          name="scale_label"
                           height="10"
                           layout="topleft"
                           left_pad="95"
@@ -362,6 +378,7 @@
                             width="130"
                             can_edit_text="true"/>
                     <text follows="left|top"
+                          name="glow_focus_label"
                           height="10"
                           layout="topleft"
                           left_delta="-5"
@@ -381,6 +398,7 @@
                             width="130"
                             can_edit_text="true"/>
                     <text follows="left|top"
+                          name="glow_size_label"
                           height="10"
                           layout="topleft"
                           left_delta="-5"
@@ -400,6 +418,7 @@
                             width="130"
                             can_edit_text="true"/>
                     <text follows="left|top"
+                          name="star_brightness_label"
                           height="10"
                           layout="topleft"
                           left_delta="-5"
@@ -420,6 +439,7 @@
                             can_edit_text="true"/>
                 </layout_panel>
                 <layout_panel border="false"
+                              name="lp_4"
                               bevel_style="in"
                               auto_resize="false"
                               user_resize="false"
@@ -443,6 +463,7 @@
                                         width="150"
                                         thumb_mode="moon"/>
                   <text follows="left|top"
+                        name="moon_azimuth_label"
                         height="10"
                         layout="topleft"
                         left_delta="0"
@@ -462,6 +483,7 @@
                           width="130"
                           can_edit_text="true"/>
                   <text follows="left|top"
+                        name="moon_elevation_label"
                         height="10"
                         layout="topleft"
                         left_delta="-5"