summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterland.cpp
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2018-06-29 20:15:10 +0100
committerGraham Linden <graham@lindenlab.com>2018-06-29 20:15:10 +0100
commitd5c465b4ab263e568761f6197534f7ddcda8a5ee (patch)
tree32796e9f7717a6ff48dcdf54e1aef4f1469d3793 /indra/newview/llfloaterland.cpp
parent1eda16b31989448a211808a8144f0a5ffb0bce49 (diff)
MAINT-8817 remove automatic update of inv_proj matrix so sunLightF which expects it not to match the projection mat works again
Fix misspellinging in missing settings asset notification string Fix moon quat conversion to get proper directional rotation Add early out so attempting to set parcel env settings doesn't crash
Diffstat (limited to 'indra/newview/llfloaterland.cpp')
-rw-r--r--indra/newview/llfloaterland.cpp1
1 files changed, 1 insertions, 0 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();