summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterenvironmentsettings.cpp
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2017-09-27 09:36:26 -0700
committerRider Linden <rider@lindenlab.com>2017-09-27 09:36:26 -0700
commit52b0d4173cec0f643f37d426aef8f5ab1fdf3232 (patch)
tree5e2cb3e2ea12cabe81bb4a6b134968109e3414b4 /indra/newview/llfloaterenvironmentsettings.cpp
parent0d414c1fb579dffc122c4d021a84cd126c612e54 (diff)
No longer 'goth windlight only', sky parameters passed from settings object.
Diffstat (limited to 'indra/newview/llfloaterenvironmentsettings.cpp')
-rw-r--r--indra/newview/llfloaterenvironmentsettings.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llfloaterenvironmentsettings.cpp b/indra/newview/llfloaterenvironmentsettings.cpp
index 4dbc8cdee0..3a059e92dc 100644
--- a/indra/newview/llfloaterenvironmentsettings.cpp
+++ b/indra/newview/llfloaterenvironmentsettings.cpp
@@ -37,6 +37,8 @@
#include "llwlparamset.h"
#include "llwlparammanager.h"
+#include "llenvironment.h"
+
LLFloaterEnvironmentSettings::LLFloaterEnvironmentSettings(const LLSD &key)
: LLFloater(key)
,mRegionSettingsRadioGroup(NULL)
@@ -188,7 +190,9 @@ void LLFloaterEnvironmentSettings::apply()
{
if (use_fixed_sky)
{
- env_mgr.useSkyPreset(sky_preset);
+ /* LAPRAS */
+ //env_mgr.useSkyPreset(sky_preset);
+ LLEnvironment::instance().selectSky(sky_preset);
}
else
{