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

Merge

master
Rider Linden 2019-02-25 14:24:20 -08:00
parent c42a364841 738ea418a8
commit 7ac03a6b75
6 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/app_settings/shaders/class1/deferred/sunDiscF.glsl
View File

@ -52,7 +52,8 @@ void main()
c.rgb = fullbrightAtmosTransport(c.rgb);
c.rgb = fullbrightScaleSoftClip(c.rgb);
c.a *= sun_fade;
// SL-9806 stars poke through
//c.a *= sun_fade;
frag_data[0] = c;
frag_data[1] = vec4(0.0f);

4
indra/newview/app_settings/shaders/class1/windlight/sunDiscF.glsl
View File

@ -47,7 +47,9 @@ void main()
vec4 sunA = texture2D(diffuseMap, vary_texcoord0.xy);
vec4 sunB = texture2D(altDiffuseMap, vary_texcoord0.xy);
vec4 c = mix(sunA, sunB, blend_factor);
c.a *= sun_fade;
// SL-9806 stars poke through
// c.a *= sun_fade;
c.rgb = pow(c.rgb, vec3(0.7f));
c.rgb = fullbrightAtmosTransport(c.rgb);

2
indra/newview/lldrawpoolwater.cpp
View File

@ -619,8 +619,6 @@ void LLDrawPoolWater::shade2(bool edge, LLGLSLShader* shader, const LLColor3& li
{
LLGLDisable cullface(GL_CULL_FACE);
sNeedsReflectionUpdate = TRUE;
sNeedsDistortionUpdate = TRUE;

7
indra/newview/llfloatereditextdaycycle.cpp
View File

@ -1322,6 +1322,11 @@ void LLFloaterEditExtDayCycle::updateSlider()
mFramesSlider->clear();
mSliderKeyMap.clear();
if (!mEditDay)
{
return;
}
LLSettingsDay::CycleTrack_t track = mEditDay->getCycleTrack(mCurrentTrack);
for (auto &track_frame : track)
{
@ -1736,7 +1741,7 @@ bool LLFloaterEditExtDayCycle::isRemovingFrameAllowed()
bool LLFloaterEditExtDayCycle::isAddingFrameAllowed()
{
if (!mFramesSlider->getCurSlider().empty()) return false;
if (!mFramesSlider->getCurSlider().empty() || !mEditDay) return false;
LLSettingsBase::Seconds frame(mTimeSlider->getCurSliderValue());
if ((mEditDay->getSettingsNearKeyframe(frame, mCurrentTrack, LLSettingsDay::DEFAULT_FRAME_SLOP_FACTOR)).second)

10
indra/newview/lltrackpicker.cpp
View File

@ -81,13 +81,21 @@ void LLFloaterTrackPicker::showPicker(const LLSD &args)
LLSD::array_const_iterator iter;
LLSD::array_const_iterator end = args.endArray();
bool select_item = true;
for (iter = args.beginArray(); iter != end; ++iter)
{
S32 track_id = (*iter)["id"].asInteger();
bool can_enable = (*iter)["enabled"].asBoolean();
LLView *view = getChild<LLCheckBoxCtrl>(RDO_TRACK_PREFIX + llformat("%d", track_id), true);
LLCheckBoxCtrl *view = getChild<LLCheckBoxCtrl>(RDO_TRACK_PREFIX + llformat("%d", track_id), true);
view->setEnabled(can_enable);
view->setLabelArg("[ALT]", (*iter).has("altitude") ? ((*iter)["altitude"].asString() + "m") : " ");
// Mark first avaliable item as selected
if (can_enable && select_item)
{
select_item = false;
view->set(TRUE);
}
}
openFloater(getKey());

3
indra/newview/pipeline.h
View File

@ -281,7 +281,8 @@ public:
void unbindDeferredShader(LLGLSLShader& shader);
void renderDeferredLighting(LLRenderTarget* light_target);
void postDeferredGammaCorrect(LLRenderTarget* screen_target);
void generateWaterReflection(LLCamera& camera);
void generateSunShadow(LLCamera& camera);
LLRenderTarget* getShadowTarget(U32 i);