diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-03-06 09:26:21 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-03-06 09:26:21 +0800 |
| commit | 5bf93b728ca7c671b6b812e753a40dcdb55b5d0d (patch) | |
| tree | ab31d87bc2436de8f3e0eeda6d2a6f34438ac6e3 /indra/llinventory | |
| parent | 53197ea0f31270a3094a6720b862bcaeee4851f2 (diff) | |
| parent | 8c1f00eebc6863c39d0143aeb7e37c68459d454f (diff) | |
Merge commit '8c1f00eebc6863c39d0143aeb7e37c68459d454f' into 2025.03
Diffstat (limited to 'indra/llinventory')
| -rw-r--r-- | indra/llinventory/llsettingssky.cpp | 3 | ||||
| -rw-r--r-- | indra/llinventory/llsettingssky.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/indra/llinventory/llsettingssky.cpp b/indra/llinventory/llsettingssky.cpp index 42ee2a6d2c..e8ecc94b4b 100644 --- a/indra/llinventory/llsettingssky.cpp +++ b/indra/llinventory/llsettingssky.cpp @@ -137,7 +137,8 @@ const std::string LLSettingsSky::SETTING_REFLECTION_PROBE_AMBIANCE("reflection_p const LLUUID LLSettingsSky::DEFAULT_ASSET_ID("651510b8-5f4d-8991-1592-e7eeab2a5a06"); -F32 LLSettingsSky::sAutoAdjustProbeAmbiance = 1.f; +const F32 LLSettingsSky::DEFAULT_AUTO_ADJUST_PROBE_AMBIANCE = 1.f; +F32 LLSettingsSky::sAutoAdjustProbeAmbiance = DEFAULT_AUTO_ADJUST_PROBE_AMBIANCE; static const LLUUID DEFAULT_SUN_ID("32bfbcea-24b1-fb9d-1ef9-48a28a63730f"); // dataserver static const LLUUID DEFAULT_MOON_ID("d07f6eed-b96a-47cd-b51d-400ad4a1c428"); // dataserver diff --git a/indra/llinventory/llsettingssky.h b/indra/llinventory/llsettingssky.h index 801fafff4b..ff75aea549 100644 --- a/indra/llinventory/llsettingssky.h +++ b/indra/llinventory/llsettingssky.h @@ -103,6 +103,7 @@ public: static const LLUUID DEFAULT_ASSET_ID; + static const F32 DEFAULT_AUTO_ADJUST_PROBE_AMBIANCE; static F32 sAutoAdjustProbeAmbiance; typedef PTR_NAMESPACE::shared_ptr<LLSettingsSky> ptr_t; |