summaryrefslogtreecommitdiff
path: root/indra/newview/llenvironment.cpp
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2018-09-19 15:31:23 -0700
committerRider Linden <rider@lindenlab.com>2018-09-19 15:31:23 -0700
commitcae08e0096f75827851a8c9447e163ddb0132f2d (patch)
tree512d05c8082a654569d9602a42e4f0874b39bac2 /indra/newview/llenvironment.cpp
parent1ef89151bda78b39f44071cfdbb28f1f0450b436 (diff)
SL-9661: Trigger an event when the settings on a parcel or region are changed. Environment panel montiors this event and updates itself when it occurs.
Diffstat (limited to 'indra/newview/llenvironment.cpp')
-rw-r--r--indra/newview/llenvironment.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/indra/newview/llenvironment.cpp b/indra/newview/llenvironment.cpp
index ec2577d053..3d8222a371 100644
--- a/indra/newview/llenvironment.cpp
+++ b/indra/newview/llenvironment.cpp
@@ -502,7 +502,9 @@ void LLEnvironment::setEnvironment(LLEnvironment::EnvSelection_t env, const LLSe
environment->setDay(pday, daylength, dayoffset);
environment->setSkyTrack(mCurrentTrack);
environment->animate();
- /*TODO: readjust environment*/
+
+ if (!mSignalEnvChanged.empty())
+ mSignalEnvChanged(env);
}
@@ -519,6 +521,8 @@ void LLEnvironment::setEnvironment(LLEnvironment::EnvSelection_t env, LLEnvironm
environment->clear();
environment->setSky((fixed.first) ? fixed.first : mEnvironments[ENV_DEFAULT]->getSky());
environment->setWater((fixed.second) ? fixed.second : mEnvironments[ENV_DEFAULT]->getWater());
+ if (!mSignalEnvChanged.empty())
+ mSignalEnvChanged(env);
/*TODO: readjust environment*/
}
@@ -605,6 +609,10 @@ void LLEnvironment::clearEnvironment(LLEnvironment::EnvSelection_t env)
}
mEnvironments[env].reset();
+
+ if (!mSignalEnvChanged.empty())
+ mSignalEnvChanged(env);
+
/*TODO: readjust environment*/
}