diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-18 16:23:47 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-18 16:23:47 -0400 |
| commit | 853231580aa2a6bf2894c20495c549a9d5f3c673 (patch) | |
| tree | 8f83d76437b4f450c7b9ce0db0c67caff3dc210c /indra/newview/llenvmanager.cpp | |
| parent | 6bdfc3d0482b3bbfb55abdb71220ea19391fbe14 (diff) | |
| parent | fc71ae3e69e78a2e34832418c6c120c9e633bbb6 (diff) | |
merge latest updates from Vadim
Diffstat (limited to 'indra/newview/llenvmanager.cpp')
| -rw-r--r-- | indra/newview/llenvmanager.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/indra/newview/llenvmanager.cpp b/indra/newview/llenvmanager.cpp index 687f9974b1..c855d8597c 100644 --- a/indra/newview/llenvmanager.cpp +++ b/indra/newview/llenvmanager.cpp @@ -302,7 +302,18 @@ bool LLEnvManager::processIncomingMessage(const LLSD& unvalidated_content, const if (valid) { - F32 sun_hour = LLPanelRegionTerrainInfo::instance()->getSunHour(); // this slider is kept up to date + F32 sun_hour = 0; + LLPanelRegionTerrainInfo* terrain_panel = LLPanelRegionTerrainInfo::instance(); + + if (terrain_panel) + { + sun_hour = terrain_panel->getSunHour(); // this slider is kept up to date + } + else + { + llwarns << "Cannot instantiate the terrain panel (exiting?)" << llendl; + } + LLWLParamManager::getInstance()->addAllSkies(scope, windlight_llsd[2]); LLEnvironmentSettings newSettings(windlight_llsd[1], windlight_llsd[2], windlight_llsd[3], sun_hour); mOrigSettingStore[scope] = newSettings; |