livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge

meow-7.2.2
Rider Linden 2019-01-15 14:41:09 -08:00
parent 38c84545cc fb75cf03a5
commit ae8f0b9ee3
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/app_settings/shaders/class1/deferred/waterF.glsl
View File

@ -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);

4
indra/newview/llpanelenvironment.cpp
View File

@ -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);
}
}

2
indra/newview/skins/default/xui/en/panel_region_environment.xml
View File

@ -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"

6
indra/newview/skins/default/xui/en/panel_settings_water.xml
View File

@ -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"