Merge

4 files changed, 7 insertions, 7 deletions

diff --git a/indra/newview/app_settings/shaders/class1/deferred/waterF.glsl b/indra/newview/app_settings/shaders/class1/deferred/waterF.glsl
index 2acfe58e82..ceadb9fb67 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/waterF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/waterF.glsl
@@ -149,7 +149,7 @@ void main()
 	spec = pow(spec, 128.0);
 
 	//figure out distortion vector (ripply)   
-	vec2 distort2 = distort+wavef.xy*refScale/max(dmod*df1, 1.0);
+	vec2 distort2 = distort+wavef.xy*refScale * 0.33/max(dmod*df1, 1.0);
 		
 	vec4 fb = texture2D(screenTex, distort2);
 	
diff --git a/indra/newview/llpanelenvironment.cpp b/indra/newview/llpanelenvironment.cpp
index f84ceb6853..c2827e451f 100644
--- a/indra/newview/llpanelenvironment.cpp
+++ b/indra/newview/llpanelenvironment.cpp
@@ -457,7 +457,7 @@ bool LLPanelEnvironmentInfo::setControlsEnabled(bool enabled)
     getChild<LLUICtrl>(ICN_GROUND)->setColor((can_enable && isRegion() && !is_legacy) ? LLColor4::white : LLColor4::grey % 0.8f);
     getChild<LLUICtrl>(ICN_WATER)->setColor((can_enable && isRegion() && !is_legacy) ? LLColor4::white : LLColor4::grey % 0.8f);
     getChild<LLUICtrl>(BTN_RST_ALTITUDES)->setEnabled(can_enable && isRegion() && !is_legacy);
-    getChild<LLUICtrl>(PNL_ENVIRONMENT_ALTITUDES)->setEnabled(can_enable && isRegion() && !is_legacy);
+    getChild<LLUICtrl>(PNL_ENVIRONMENT_ALTITUDES)->setEnabled(can_enable && !is_legacy);
     getChild<LLUICtrl>(CHK_ALLOWOVERRIDE)->setEnabled(can_enable && isRegion() && !is_legacy);
 
     for (U32 idx = 0; idx < ALTITUDE_MARKERS_COUNT; idx++)
@@ -475,7 +475,7 @@ bool LLPanelEnvironmentInfo::setControlsEnabled(bool enabled)
         LLSettingsDropTarget* drop_target = findChild<LLSettingsDropTarget>("sdt_" + alt_prefixes[idx]);
         if (drop_target)
         {
-            drop_target->setDndEnabled(enabled && !is_legacy);
+            drop_target->setDndEnabled(can_enable && !is_legacy);
         }
     }
 
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 0c0ca2ac60..32b6e56acd 100644
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -17,7 +17,7 @@
     <string name="str_cross_region">Environmental settings are not available across region boundries.</string>
     <string name="str_legacy">Environmental settings are not available on this region.</string>
     <string name="str_disallowed">The estate manager does not allow changing parcel environments in this region.</string>
-    <string name="str_too_small">The parcel must be at least 128 square meeters to support an environment.</string>
+    <string name="str_too_small">The parcel must be at least 128 square meters to support an environment.</string>
     <string name="str_empty">(empty)</string>
     <layout_stack 
             width="530"
diff --git a/indra/newview/skins/default/xui/en/panel_settings_water.xml b/indra/newview/skins/default/xui/en/panel_settings_water.xml
index 55d104f7b2..88d0f7827b 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_water.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_water.xml
@@ -62,7 +62,7 @@
             </text>
             <slider
                     decimal_digits="1"
-                    follows="left|top|right"
+                    follows="left|top"
                     height="16"
                     increment="0.01"
                     initial_value="0"
@@ -83,7 +83,7 @@
                 Underwater Modifier:</text>
             <slider
                     decimal_digits="1"
-                    follows="left|top|right"
+                    follows="left|top"
                     height="16"
                     increment="0.01"
                     initial_value="0"
@@ -127,7 +127,7 @@
                     </text>
                     <slider
                             decimal_digits="2"
-                            follows="left|top|right"
+                            follows="left|top"
                             increment="0.01"
                             initial_value="0.7"
                             height="16"