diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-06-29 13:00:25 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-06-29 13:00:25 -0700 |
| commit | 6a1f7955ac7f1407ef7bc70af720c0327b38c455 (patch) | |
| tree | 0ad196ba97fdcd8ffe895c40550ddb6dab711d0b /indra/newview | |
| parent | 96e8e670e104d852b1a925976f3d935448eba103 (diff) | |
| parent | 6f5ea064c02a9fd473cad6ce7bc2bd4c9f791c99 (diff) | |
Merge
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloaterland.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/pipeline.cpp | 8 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index fcf836f4a0..dacdb197e7 100644 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -3297,6 +3297,7 @@ void LLPanelLandEnvironment::doApply() if (!parcel) { LL_WARNS("PARCEL") << "Could not get parcel." << LL_ENDL; + return; } S32 parcel_id = parcel->getLocalID(); diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 7be05a1bcb..aadd059546 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -6258,8 +6258,8 @@ void LLPipeline::setupHWLights(LLDrawPool* pool) // Light 0 = Sun or Moon (All objects) { - LLVector4 sun_dir = environment.getSunDirectionCFR(); - LLVector4 moon_dir = environment.getMoonDirectionCFR(); + LLVector4 sun_dir(environment.getSunDirection(), 0.0f); + LLVector4 moon_dir(environment.getMoonDirection(), 0.0f); mSunDir.setVec(sun_dir); mMoonDir.setVec(moon_dir); @@ -8480,9 +8480,11 @@ void LLPipeline::renderDeferredLighting() glh::vec4f tc(mSunDir.mV); mat.mult_matrix_vec(tc); mTransformedSunDir.set(tc.v); + mTransformedSunDir.normalize(); glh::vec4f tc_moon(mMoonDir.mV); mTransformedMoonDir.set(tc_moon.v); + mTransformedMoonDir.normalize(); } gGL.pushMatrix(); @@ -9096,9 +9098,11 @@ void LLPipeline::renderDeferredLightingToRT(LLRenderTarget* target) glh::vec4f tc(mSunDir.mV); mat.mult_matrix_vec(tc); mTransformedSunDir.set(tc.v); + mTransformedSunDir.normalize(); glh::vec4f tc_moon(mMoonDir.mV); mTransformedMoonDir.set(tc_moon.v); + mTransformedMoonDir.normalize(); } gGL.pushMatrix(); diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index f69c3d261f..fcabf1059e 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -11101,7 +11101,7 @@ Cannot create large prims that intersect other residents. Please re-try when ot name="FailedToFindSettings" persist="true" type="alertmodal"> -Failed to find the settisgs named [DESC] in database. +Failed to find the settings named [DESC] in database. <tag>fail</tag> </notification> |