diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-05-20 09:48:19 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-05-20 09:48:19 -0400 |
| commit | 60f54abb33a8a0f4f3bd0fa23aee84d695486f92 (patch) | |
| tree | e47719db985550fc0eb07a3f76e9dbc9144143c5 /indra/newview/llenvmanager.cpp | |
| parent | 03202e5d4ddd371eb9b5822ef2fd7775fddb7f80 (diff) | |
STORM-1265: partial fix for region updates; further integration with new dialogs needed.
Diffstat (limited to 'indra/newview/llenvmanager.cpp')
| -rw-r--r-- | indra/newview/llenvmanager.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llenvmanager.cpp b/indra/newview/llenvmanager.cpp index b670c730a7..633b9c7c52 100644 --- a/indra/newview/llenvmanager.cpp +++ b/indra/newview/llenvmanager.cpp @@ -127,7 +127,7 @@ void LLEnvManager::startEditingScope(LLEnvKey::EScope scope) // not implemented here (yet) return; case LLEnvKey::SCOPE_REGION: - LLPanelRegionTerrainInfo::instance()->setCommitControls(true); + /* LLPanelRegionTerrainInfo::instance()->setCommitControls(true); the windlight settings are no longer on the region terrain panel */ break; default: return; @@ -182,7 +182,7 @@ void LLEnvManager::clearEditingScope(const LLSD& notification, const LLSD& respo mIsEditing = false; updateUIFromEditability(); - LLPanelRegionTerrainInfo::instance()->cancelChanges(); + /* LLPanelRegionTerrainInfo::instance()->cancelChanges(); the terrain panel no longer has windlight data - if this is needed, it should move. */ loadSettingsIntoManagers(mCurNormalScope, true); } @@ -305,6 +305,7 @@ bool LLEnvManager::processIncomingMessage(const LLSD& unvalidated_content, const if (valid) { + // TODO - the sun controls are moving; this should be updated F32 sun_hour = 0; LLPanelRegionTerrainInfo* terrain_panel = LLPanelRegionTerrainInfo::instance(); |