summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorVadim ProductEngine <vsavchuk@productengine.com>2011-05-23 19:30:05 +0300
committerVadim ProductEngine <vsavchuk@productengine.com>2011-05-23 19:30:05 +0300
commit3befc1b988c0eae0d344b31a361166c734c91a3d (patch)
tree50865d194170d62161f1436a2357f5e4b2e95d91 /indra/newview
parentb60c63bf075a92084ba94459a840decba846a916 (diff)
STORM-1256 WIP Moved a public method to the appropriate place.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llenvmanager.cpp40
1 files changed, 20 insertions, 20 deletions
diff --git a/indra/newview/llenvmanager.cpp b/indra/newview/llenvmanager.cpp
index 0391a5adb2..9f15f9adfc 100644
--- a/indra/newview/llenvmanager.cpp
+++ b/indra/newview/llenvmanager.cpp
@@ -793,6 +793,26 @@ void LLEnvManagerNew::onTeleport()
onRegionChange(false);
}
+void LLEnvManagerNew::onRegionSettingsResponse(const LLSD& content)
+{
+ // If the message was valid, grab the UUID from it and save it for next outbound update message.
+ mLastReceivedID = content[0]["messageID"].asUUID();
+
+ // 1. Refresh cached region settings.
+ LL_DEBUGS("Windlight") << "Caching region environment settings: " << content << LL_ENDL;
+ F32 sun_hour = 0; // *TODO
+ LLEnvironmentSettings new_settings(content[1], content[2], content[3], sun_hour);
+ mCachedRegionPrefs = new_settings;
+
+ // 2. If using server settings, update managers.
+ if (getUseRegionSettings())
+ {
+ updateManagersFromPrefs(mInterpNextChangeMessage);
+ }
+
+ mInterpNextChangeMessage = false;
+}
+
//-- private methods ----------------------------------------------------------
// virtual
@@ -835,23 +855,3 @@ void LLEnvManagerNew::onRegionChange(bool interpolate)
mInterpNextChangeMessage = interpolate;
requestRegionSettings();
}
-
-void LLEnvManagerNew::onRegionSettingsResponse(const LLSD& content)
-{
- // If the message was valid, grab the UUID from it and save it for next outbound update message.
- mLastReceivedID = content[0]["messageID"].asUUID();
-
- // 1. Refresh cached region settings.
- LL_DEBUGS("Windlight") << "Caching region environment settings: " << content << LL_ENDL;
- F32 sun_hour = 0; // *TODO
- LLEnvironmentSettings new_settings(content[1], content[2], content[3], sun_hour);
- mCachedRegionPrefs = new_settings;
-
- // 2. If using server settings, update managers.
- if (getUseRegionSettings())
- {
- updateManagersFromPrefs(mInterpNextChangeMessage);
- }
-
- mInterpNextChangeMessage = false;
-}