summaryrefslogtreecommitdiff
path: root/indra/newview/llwlparamset.h
diff options
context:
space:
mode:
authorandreykproductengine <andreykproductengine@lindenlab.com>2019-05-21 19:39:52 +0300
committerandreykproductengine <andreykproductengine@lindenlab.com>2019-05-21 19:39:52 +0300
commitc2c8753d2565c9fba41f0d5dd390e14d72cd40b9 (patch)
treee0db4dce241e3527e98fb5ae84f4d926420e40b5 /indra/newview/llwlparamset.h
parent401868c440fb77b101845f1efc6ec1b1f2ef3352 (diff)
SL-11012 Ambient setting can be missing from llsd
Diffstat (limited to 'indra/newview/llwlparamset.h')
-rw-r--r--indra/newview/llwlparamset.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llwlparamset.h b/indra/newview/llwlparamset.h
index 6e5f1d3a4b..9874f0f2e0 100644
--- a/indra/newview/llwlparamset.h
+++ b/indra/newview/llwlparamset.h
@@ -136,6 +136,9 @@ public:
void setEastAngle(F32 val);
F32 getEastAngle();
+
+ void setAmbient(const LLVector4& val);
+ LLVector4 getAmbient();
@@ -207,6 +210,11 @@ inline F32 LLWLParamSet::getEastAngle() {
return (F32) mParamValues["east_angle"].asReal();
}
+inline LLVector4 LLWLParamSet::getAmbient() {
+ bool error;
+ return mParamValues.has("ambient") ? getVector("ambient", error) : LLVector4(0.5f, 0.75f, 1.0f, 1.19f);
+}
+
inline void LLWLParamSet::setEnableCloudScrollX(bool val) {
mParamValues["enable_cloud_scroll"][0] = val;