diff options
| author | tiggs@lindenlab.com <tiggs@lindenlab.com> | 2011-02-23 17:44:18 -0500 |
|---|---|---|
| committer | tiggs@lindenlab.com <tiggs@lindenlab.com> | 2011-02-23 17:44:18 -0500 |
| commit | 758fdbfe125d75bd2253a69337eab7fec7406ecf (patch) | |
| tree | 4bead0bf6b11efc55d5eb91d2b3b25d44fdb5c31 /indra/newview/llenvmanager.cpp | |
| parent | 6bb02e0e260df2d00ab53376cf15af5e7e2fd12f (diff) | |
STORM-1126 WIP Windlight Estate Settings port from 1.23: baseline: read only windlight works
(resubmitted by Vadim ProductEngine)
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 daf3f90234..8e5889e74b 100644 --- a/indra/newview/llenvmanager.cpp +++ b/indra/newview/llenvmanager.cpp @@ -80,7 +80,7 @@ void LLEnvManager::changedRegion(bool interp) mInterpNextChangeMessage = interp; mPendingOutgoingMessage = false; - LLFloaterEnvSettings::instance()->closeFloater(); + // TIGGGS LLFloaterEnvSettings::instance()->closeFloater(); resetInternalsToDefault(LLEnvKey::SCOPE_REGION); @@ -179,8 +179,8 @@ void LLEnvManager::updateUIFromEditability() // *TODO When the checkbox from LLFloaterEnvSettings is moved elsewhere, opening the local environment settings window should auto-display local settings // Currently, disable all editing to ensure region settings are hidden from those that can't edit them (to preserve possibility of future tradable assets) // Remove "!gSavedSettings.getBOOL(...)" when the desired behavior is implemented - LLFloaterEnvSettings::instance()->setControlsEnabled(canEdit(LLEnvKey::SCOPE_LOCAL) && !gSavedSettings.getBOOL("UseEnvironmentFromRegion")); - LLPanelRegionTerrainInfo::instance()->setEnvControls(canEdit(LLEnvKey::SCOPE_REGION)); +// LLFloaterEnvSettings::instance()->setControlsEnabled(canEdit(LLEnvKey::SCOPE_LOCAL) && !gSavedSettings.getBOOL("UseEnvironmentFromRegion")); +// LLPanelRegionTerrainInfo::instance()->setEnvControls(canEdit(LLEnvKey::SCOPE_REGION)); // enable estate UI iff canEdit(LLEnvKey::SCOPE_ESTATE), etc. } |