diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llfloaterenvsettings.cpp | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/linden/indra/newview/llfloaterenvsettings.cpp b/linden/indra/newview/llfloaterenvsettings.cpp index 661c398..557a5e1 100644 --- a/linden/indra/newview/llfloaterenvsettings.cpp +++ b/linden/indra/newview/llfloaterenvsettings.cpp | |||
@@ -31,7 +31,6 @@ | |||
31 | */ | 31 | */ |
32 | 32 | ||
33 | #include "llviewerprecompiledheaders.h" | 33 | #include "llviewerprecompiledheaders.h" |
34 | |||
35 | #include "llfloaterenvsettings.h" | 34 | #include "llfloaterenvsettings.h" |
36 | 35 | ||
37 | #include "llfloaterwindlight.h" | 36 | #include "llfloaterwindlight.h" |
@@ -41,7 +40,8 @@ | |||
41 | #include "llcombobox.h" | 40 | #include "llcombobox.h" |
42 | #include "llcolorswatch.h" | 41 | #include "llcolorswatch.h" |
43 | #include "llwlanimator.h" | 42 | #include "llwlanimator.h" |
44 | 43 | #include "llviewergenericmessage.h" | |
44 | #include "meta7windlight.h" | ||
45 | #include "llwlparamset.h" | 45 | #include "llwlparamset.h" |
46 | #include "llwlparammanager.h" | 46 | #include "llwlparammanager.h" |
47 | #include "llwaterparammanager.h" | 47 | #include "llwaterparammanager.h" |
@@ -87,6 +87,7 @@ void LLFloaterEnvSettings::initCallbacks(void) | |||
87 | // WL Top | 87 | // WL Top |
88 | childSetAction("EnvAdvancedSkyButton", onOpenAdvancedSky, NULL); | 88 | childSetAction("EnvAdvancedSkyButton", onOpenAdvancedSky, NULL); |
89 | childSetAction("EnvAdvancedWaterButton", onOpenAdvancedWater, NULL); | 89 | childSetAction("EnvAdvancedWaterButton", onOpenAdvancedWater, NULL); |
90 | childSetAction("EnvSubmitWindlight", onSubmitWindlight, NULL); | ||
90 | childSetAction("EnvUseEstateTimeButton", onUseEstateTime, NULL); | 91 | childSetAction("EnvUseEstateTimeButton", onUseEstateTime, NULL); |
91 | childSetAction("EnvSettingsHelpButton", onClickHelp, this); | 92 | childSetAction("EnvSettingsHelpButton", onClickHelp, this); |
92 | } | 93 | } |
@@ -284,6 +285,20 @@ void LLFloaterEnvSettings::onOpenAdvancedWater(void* userData) | |||
284 | LLFloaterWater::show(); | 285 | LLFloaterWater::show(); |
285 | } | 286 | } |
286 | 287 | ||
288 | void LLFloaterEnvSettings::onSubmitWindlight(void* userData) | ||
289 | { | ||
290 | Meta7WindlightPacket * wl = new Meta7WindlightPacket(); | ||
291 | |||
292 | LLWaterParamManager * param_mgr = LLWaterParamManager::instance(); | ||
293 | wl->reflectionWaveletScale.X = param_mgr->mNormalScale.mX; | ||
294 | wl->reflectionWaveletScale.Y = param_mgr->mNormalScale.mY; | ||
295 | wl->reflectionWaveletScale.Z = param_mgr->mNormalScale.mZ; | ||
296 | |||
297 | |||
298 | std::vector<std::string> strings; | ||
299 | strings.push_back((char*)wl); | ||
300 | send_generic_message("Windlight", strings); | ||
301 | } | ||
287 | 302 | ||
288 | void LLFloaterEnvSettings::onUseEstateTime(void* userData) | 303 | void LLFloaterEnvSettings::onUseEstateTime(void* userData) |
289 | { | 304 | { |