merge another batch of changes from windlight integration repo

3 files changed, 118 insertions, 127 deletions

diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp
index 1023a4339b..5b76537804 100644
--- a/indra/newview/lltexturectrl.cpp
+++ b/indra/newview/lltexturectrl.cpp
@@ -1093,7 +1093,7 @@ public:
 
 BOOL LLTextureCtrl::handleHover(S32 x, S32 y, MASK mask)
 {
-	getWindow()->setCursor(UI_CURSOR_HAND);
+	getWindow()->setCursor(mBorder->parentPointInView(x,y) ? UI_CURSOR_HAND : UI_CURSOR_ARROW);
 	return TRUE;
 }
 
@@ -1102,7 +1102,7 @@ BOOL LLTextureCtrl::handleMouseDown(S32 x, S32 y, MASK mask)
 {
 	BOOL handled = LLUICtrl::handleMouseDown( x, y , mask );
 
-	if( !handled )
+	if (!handled && mBorder->parentPointInView(x, y))
 	{
 		showPicker(FALSE);
 		//grab textures first...
diff --git a/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml
index 2c78d51c9f..7aae966879 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  legacy_header_height="18"
- height="450"
+ height="381"
  layout="topleft"
  name="Edit Day cycle"
  help_topic="day_presets"
  save_rect="true"
  title="Edit Day Cycle"
- width="800">
+ width="705">
 
     <string name="title_new">Create a New Day Cycle</string>
     <string name="title_edit">Edit Day Cycle</string>
@@ -19,16 +19,16 @@
      follows="top|left|right"
      height="10"
      layout="topleft"
-     left="30"
+     left="10"
      name="hint"
      top="25"
-     width="700" />
+     width="685" />
     <text
      follows="top|left|right"
      font="SansSerif"
      height="10"
      layout="topleft"
-     left="30"
+     left="10"
      name="label"
      top_pad="25"
      width="120">
@@ -52,42 +52,23 @@
      width="200" />
     <text
      follows="top|left|right"
-     height="40"
+     height="95"
      layout="topleft"
      left_pad="10"
      name="note"
      top_delta="0"
-     width="405"
+     width="345"
      wrap="true">
      Note: if you change the name of your preset, you will be creating a new preset and the existing preset will not be changed.
     </text>
  <!--======== Controls panel ========-->
-    <view_border
-     bevel_style="none"
-     follows="top|left"
-     height="300"
-     layout="topleft"
-     left="25"
-     name="water_panel"
-     top="100"
-     width="750"/>
-    <text
-     follows="top|left|right"
-     height="10"
-     layout="topleft"
-     name="water_preset_help"
-     right="770"
-     top="104"
-     width="100">
-     Control Help
-    </text>
     <text
      follows="left|top|right"
      height="10"
      layout="topleft"
-     left="40"    
+     left="10"    
      name="water_color_label"
-     top="125"
+     top="100"
      width="300">
      - Click on a tab to edit the specific sky settings and time.
     </text>
@@ -115,8 +96,8 @@
      name="day_cycle_slider_panel"
      layout="topleft"
      left_delta="25"
-     top_pad="25"
-     width="670">
+     top_pad="15"
+     width="660">
         <multi_slider
          can_edit_text="true"
          control_name="WLTimeSlider"
@@ -409,6 +390,7 @@
          name="WL12amHash2"
          top_delta="-3"
          width="6">
+         |
         </text>
     </panel>
     <text
@@ -421,7 +403,7 @@
      layout="topleft"
      left_delta="192"
      name="WLCurKeyTimeText2"
-     top_pad="30"
+     top_pad="10"
      width="80">
         Sky Setting:
     </text>
@@ -456,39 +438,48 @@
      top_delta="-1"
      value="6:00 AM"
      width="75"/> 
-        <loading_indicator
-         height="23"
-         layout="topleft"
-         left="25"
-         name="progress_indicator"
-         top="417"
-         visible="false"
-         width="23" />
-        <check_box
-         follows="top|left"
-         height="10"
-         label="Make this my new day cycle"
-         layout="topleft"
-         left="330"
-         name="make_default_cb"
-         top="430"
-         width="280"/>
-        <button
-         follows="bottom|right"
-         height="23"
-         label="Save"
-         layout="topleft"
-         left_pad="0"
-         name="save"
-         top="417"
-         width="70"/>
-        <button
-         follows="bottom|right"
-         height="23"
-         label="Cancel"
-         layout="topleft"
-         left_pad="15"
-         name="cancel"
-         top_delta="0"
-         width="70"/>
+    <view_border
+     bevel_style="none"
+     follows="top|left"
+     height="0"
+     layout="topleft"
+     left="10"
+     name="horiz_separator"
+     top_pad="20"
+     width="685"/>
+    <loading_indicator
+     height="23"
+     layout="topleft"
+     left="25"
+     name="progress_indicator"
+     top="350"
+     visible="false"
+     width="23" />
+    <check_box
+     follows="top|left"
+     height="10"
+     label="Make this my new day cycle"
+     layout="topleft"
+     left="310"
+     name="make_default_cb"
+     top_delta="13"
+     width="230"/>
+    <button
+     follows="bottom|right"
+     height="23"
+     label="Save"
+     layout="topleft"
+     left_pad="0"
+     name="save"
+     top_delta="-13"
+     width="70"/>
+    <button
+     follows="bottom|right"
+     height="23"
+     label="Cancel"
+     layout="topleft"
+     left_pad="15"
+     name="cancel"
+     top_delta="0"
+     width="70"/>
  </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml
index 7d7e170c1e..905983e7fa 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  legacy_header_height="18"
- height="450"
+ height="375"
  layout="topleft"
  name="Edit Water Preset"
  help_topic="water_preset"
  save_rect="true"
  title="Edit Water Preset"
- width="900">
+ width="725">
 
   <string name="title_new">Create a New Water Preset</string>
   <string name="title_edit">Edit a Water Preset</string>
@@ -22,7 +22,7 @@
    left="30"
    name="hint"
    top="25"
-   width="700">
+   width="680">
    	To edit your preset, adjust the controls then click "Save"
    </text>
    
@@ -62,49 +62,40 @@
    left_pad="10"
    name="note"
    top_delta="0"
-   width="405"
+   width="340"
    wrap="true">
    	Note: if you change the name of your preset, you will be creating a new preset and the existing preset will not be changed.
    </text>
  
  <!--======== Controls panel ========-->
  <panel
- border="true"
- bevel_style="none"
- follows="top|left"
- height="300"
- layout="topleft"
- left="25"
- name="panel_water_preset"
- top="100"
- width="850">
+  border="false"
+  bevel_style="none"
+  follows="top|left"
+  height="230"
+  layout="topleft"
+  left="10"
+  name="panel_water_preset"
+  top="100"
+  width="700">
  
-  <text
-   follows="top|left|right"
-   layout="topleft"
-   name="water_preset_help"
-   right="870"
-   top_pad="4"
-   width="100">
-   Control Help
-   </text>
-
 <!--======== I conlumn of controls ========-->   
    <text
     follows="left|top|right"
     height="10"
     font="SansSerif"
     layout="topleft"
-    left="40"    
+    left="10"    
     name="water_color_label"
-    top="25"
-    width="200">
+    top="5"
+    width="215">
        Water Fog Color
    </text>
    <color_swatch
     can_apply_immediately="true"
     follows="left|top"
-    height="60"
+    height="37"
+    label_height="0"
     layout="topleft"
     left_delta="15"
     name="WaterFogColor"
@@ -117,9 +108,9 @@
     font="SansSerif"
     layout="topleft"
     left_delta="-15"
-    top_pad="0"
+    top_pad="10"
     name="water_fog_density_label"
-    width="200">
+    width="215">
     	Fog Density Exponent
    </text>
    <slider
@@ -142,7 +133,7 @@
     left_delta="-15"
     top_pad="15"
     name="underwater_fog_modifier_label"
-    width="200">
+    width="215">
     	Underwater Fog Modifier
    </text>
    <slider
@@ -165,7 +156,7 @@
      left_delta="-15"
      name="BHText"
      top_pad="15"
-     width="200">
+     width="215">
         Big Wave Direction
     </text>    
     <slider
@@ -202,10 +193,10 @@
      font="SansSerif"
      height="10"
      layout="topleft"
-     left_pad="55"
+     left_pad="20"
      name="BDensText"
-     top="25"
-     width="200">
+     top="5"
+     width="215">
         Reflection Wavelet Scale
     </text>
     <slider
@@ -248,7 +239,7 @@
      left_delta="-15"
      name="HDText"
      top_pad="16"
-     width="200">
+     width="215">
         Fresnel Scale
     </text>
     <slider
@@ -270,7 +261,7 @@
      left_delta="-15"
      name="FresnelOffsetText"
      top_pad="15"
-     width="200">
+     width="215">
         Fresnel Offset
     </text>
     <slider
@@ -293,7 +284,7 @@
       left_delta="-15"
       name="BHText2"
       top_pad="15"
-      width="200">
+      width="215">
          Little Wave Direction
      </text>
      <slider
@@ -328,12 +319,12 @@
 	 <text
       follows="left|top|right"
       font="SansSerif"
-      height="10"
+      height="16"
       layout="topleft"
-      left_pad="55"
+      left_pad="20"
       name="DensMultText"
-      top="25"
-      width="200">
+      top="5"
+      width="215">
          Refract Scale Above
      </text>
      <slider
@@ -345,7 +336,7 @@
       layout="topleft"
       left_delta="15"
       name="WaterScaleAbove"
-      top_pad="10"
+      top_pad="5"
       width="200" />
      
      <text
@@ -358,7 +349,7 @@
       left_delta="-15"
       name="WaterScaleBelowText"
       top_pad="15"
-      width="200">
+      width="215">
          Refract Scale Below
      </text>
      <slider
@@ -371,7 +362,7 @@
       layout="topleft"
       left_delta="15"
       name="WaterScaleBelow"
-      top_pad="10"
+      top_pad="5"
       width="200"/>
      
      <text
@@ -382,7 +373,7 @@
       left_delta="-15"
       name="MaxAltText"
       top_pad="15"
-      width="200">
+      width="215">
          Blur Multiplier
      </text>
      <slider
@@ -395,39 +386,48 @@
       left_delta="15"
       max_val="0.16"
       name="WaterBlurMult"
-      top_pad="10"
+      top_pad="5"
       width="200"/>
       
       <text
        follows="left|top|right"
        font="SansSerif"
-       height="10"
+       height="16"
        layout="topleft"
        left_delta="-15"
        name="BHText3"
        top_pad="15"
-       width="200">
+       width="215">
           Normal Map
       </text>
       <texture_picker
-       height="100"
+       height="80"
        layout="topleft"
        left_delta="15"
        name="WaterNormalMap"
-       top_delta="22"
+       top_pad="5"
        width="100" />
 	</panel>
 <!--======== End of Controls panel ========-->	
+
+    <view_border
+     bevel_style="none"
+     follows="top|left"
+     height="0"
+     layout="topleft"
+     left="10"
+     name="horiz_separator"
+     top_pad="5"
+     width="700"/>
 	<check_box
-	follows="top|left"
-	height="10"
-	label="Make this preset my new water setting"
-	layout="topleft"
-	left="430"
-	name="make_default_cb"
-	top_pad="30"
-	width="280"/>
-	
+	 follows="top|left"
+	 height="10"
+	 label="Make this preset my new water setting"
+	 layout="topleft"
+	 left="275"
+	 name="make_default_cb"
+	 top_pad="20"
+	 width="280"/>
 	<button
 	 follows="bottom|right"
 	 height="23"