diff options
| author | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-04-12 22:07:59 +0300 |
|---|---|---|
| committer | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-04-12 22:07:59 +0300 |
| commit | 19f356202a9516664c1cacb9b50e9b6e1e072375 (patch) | |
| tree | 2e3099569987ce4e0b7fd140628776cccd4b5333 /indra/newview/llenvmanager.cpp | |
| parent | fd18b0cd7e5d6b047ac482a9ba4926470f573fbf (diff) | |
STORM-1143 FIXED Server sometimes said region wasn't capable of storing environment settings.
Reason: We tried to check whether the region supports environment settings
without making sure that we've actually recieved region capabilities,
so the check sometimes failed.
Fix: Defer check for the "EnvironmentSettings" capability until we've received the region capabilities.
Diffstat (limited to 'indra/newview/llenvmanager.cpp')
| -rw-r--r-- | indra/newview/llenvmanager.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llenvmanager.cpp b/indra/newview/llenvmanager.cpp index b69586e88e..687f9974b1 100644 --- a/indra/newview/llenvmanager.cpp +++ b/indra/newview/llenvmanager.cpp @@ -261,7 +261,7 @@ void LLEnvManager::refreshFromStorage(LLEnvKey::EScope scope) case LLEnvKey::SCOPE_LOCAL: break; case LLEnvKey::SCOPE_REGION: - if (!LLEnvironmentRequestResponder::initiateRequest()) + if (!LLEnvironmentRequest::initiate()) { // don't have a cap for this, presume invalid response processIncomingMessage(LLSD(), scope); @@ -297,11 +297,11 @@ bool LLEnvManager::processIncomingMessage(const LLSD& unvalidated_content, const // end HACK mLastReceivedID = unvalidated_content[0]["messageID"].asUUID(); // if the message was valid, grab the UUID from it and save it for next outbound update message + LL_DEBUGS("Windlight Sync") << "mLastReceivedID: " << mLastReceivedID << LL_ENDL; + LL_DEBUGS("Windlight Sync") << "windlight_llsd: " << windlight_llsd << LL_ENDL; if (valid) { - LL_DEBUGS("Windlight Sync") << "windlight_llsd: " << windlight_llsd << LL_ENDL; - F32 sun_hour = LLPanelRegionTerrainInfo::instance()->getSunHour(); // this slider is kept up to date LLWLParamManager::getInstance()->addAllSkies(scope, windlight_llsd[2]); LLEnvironmentSettings newSettings(windlight_llsd[1], windlight_llsd[2], windlight_llsd[3], sun_hour); |