livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

STORM-1279 WIP Renamed a method.

meow-7.2.2
Vadim ProductEngine 2011-06-09 21:56:33 +03:00
parent d6b0afb914
commit a7603c8487
2 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
indra/newview/llenvmanager.cpp
View File

@ -596,27 +596,27 @@ std::string LLEnvPrefs::getDayCycleName() const
return mDayCycleName;
}
void LLEnvPrefs::setUseDefaults(bool val)
void LLEnvPrefs::setUseRegionSettings(bool val)
{
mUseDefaults = val;
mUseRegionSettings = val;
}
void LLEnvPrefs::setUseWaterPreset(const std::string& name)
{
setUseDefaults(false);
mUseRegionSettings = false;
mWaterPresetName = name;
}
void LLEnvPrefs::setUseSkyPreset(const std::string& name)
{
setUseDefaults(false);
mUseRegionSettings = false;
mUseDayCycle = false;
mSkyPresetName = name;
}
void LLEnvPrefs::setUseDayCycle(const std::string& name)
{
setUseDefaults(false);
mUseRegionSettings = false;
mUseDayCycle = true;
mDayCycleName = name;
}
@ -627,7 +627,7 @@ LLEnvManagerNew::LLEnvManagerNew()
mInterpNextChangeMessage = true;
// Set default environment settings.
mUserPrefs.mUseDefaults = true;
mUserPrefs.mUseRegionSettings = true;
mUserPrefs.mUseDayCycle = true;
mUserPrefs.mWaterPresetName = "Default";
mUserPrefs.mSkyPresetName = "Default";
@ -636,7 +636,7 @@ LLEnvManagerNew::LLEnvManagerNew()
bool LLEnvManagerNew::getUseRegionSettings() const
{
return mUserPrefs.getUseDefaults();
return mUserPrefs.getUseRegionSettings();
}
bool LLEnvManagerNew::getUseDayCycle() const
@ -746,7 +746,7 @@ bool LLEnvManagerNew::useDayCycleParams(const LLSD& params, LLEnvKey::EScope sco
void LLEnvManagerNew::setUseRegionSettings(bool val)
{
mUserPrefs.setUseDefaults(val);
mUserPrefs.setUseRegionSettings(val);
saveUserPrefs();
updateManagersFromPrefs(false);
}
@ -799,8 +799,8 @@ void LLEnvManagerNew::loadUserPrefs()
mUserPrefs.mSkyPresetName = gSavedSettings.getString("SkyPresetName");
mUserPrefs.mDayCycleName = gSavedSettings.getString("DayCycleName");
mUserPrefs.mUseDefaults = gSavedSettings.getBOOL("UseEnvironmentFromRegion");
mUserPrefs.mUseDayCycle = gSavedSettings.getBOOL("UseDayCycle");
mUserPrefs.mUseRegionSettings = gSavedSettings.getBOOL("UseEnvironmentFromRegion");
mUserPrefs.mUseDayCycle = gSavedSettings.getBOOL("UseDayCycle");
}
void LLEnvManagerNew::saveUserPrefs()
@ -825,8 +825,8 @@ void LLEnvManagerNew::setUserPrefs(
mUserPrefs.mSkyPresetName = sky_preset;
mUserPrefs.mDayCycleName = day_cycle_preset;
mUserPrefs.mUseDefaults = use_region_settings;
mUserPrefs.mUseDayCycle = !use_fixed_sky;
mUserPrefs.mUseRegionSettings = use_region_settings;
mUserPrefs.mUseDayCycle = !use_fixed_sky;
saveUserPrefs();
updateManagersFromPrefs(false);

10
indra/newview/llenvmanager.h
View File

@ -232,15 +232,13 @@ private:
/**
* User environment preferences.
*
* defaults = use region settings
*/
class LLEnvPrefs
{
public:
LLEnvPrefs() : mUseDefaults(true), mUseDayCycle(true) {}
LLEnvPrefs() : mUseRegionSettings(true), mUseDayCycle(true) {}
bool getUseDefaults() const { return mUseDefaults; }
bool getUseRegionSettings() const { return mUseRegionSettings; }
bool getUseDayCycle() const { return mUseDayCycle; }
bool getUseFixedSky() const { return !getUseDayCycle(); }
@ -248,12 +246,12 @@ public:
std::string getSkyPresetName() const;
std::string getDayCycleName() const;
void setUseDefaults(bool val);
void setUseRegionSettings(bool val);
void setUseWaterPreset(const std::string& name);
void setUseSkyPreset(const std::string& name);
void setUseDayCycle(const std::string& name);
bool mUseDefaults;
bool mUseRegionSettings;
bool mUseDayCycle;
std::string mWaterPresetName;
std::string mSkyPresetName;