diff options
| author | Maxim Nikolenko <maximnproductengine@lindenlab.com> | 2023-11-13 19:33:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-13 19:33:18 +0200 |
| commit | 7e66f6ca18e667093ac6b505badf25d467e5acff (patch) | |
| tree | 47c57dc0a296fcc92c1409cf8903d3cfb5e74143 /indra | |
| parent | aff01e2fd4fb5475eb42ce58d1ad997341cb7a94 (diff) | |
SL-20277 ignore both settings when loading camera preset
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llpresetsmanager.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/indra/newview/llpresetsmanager.cpp b/indra/newview/llpresetsmanager.cpp index bc77588b9f..1fcc456d62 100644 --- a/indra/newview/llpresetsmanager.cpp +++ b/indra/newview/llpresetsmanager.cpp @@ -458,6 +458,9 @@ void LLPresetsManager::loadPreset(const std::string& subdirectory, std::string n LL_DEBUGS() << "attempting to load preset '"<<name<<"' from '"<<full_path<<"'" << LL_ENDL; + bool appearance_camera_movement = gSavedSettings.getBOOL("AppearanceCameraMovement"); + bool edit_camera_movement = gSavedSettings.getBOOL("EditCameraMovement"); + mIgnoreChangedSignal = true; if(gSavedSettings.loadFromFile(full_path, false, true) > 0) { @@ -477,6 +480,16 @@ void LLPresetsManager::loadPreset(const std::string& subdirectory, std::string n { gSavedSettings.setString("PresetCameraActive", name); triggerChangeCameraSignal(); + + //SL-20277 old preset files may contain settings that should be ignored when loading camera presets + if (appearance_camera_movement != (bool)gSavedSettings.getBOOL("AppearanceCameraMovement")) + { + gSavedSettings.setBOOL("AppearanceCameraMovement", appearance_camera_movement); + } + if (edit_camera_movement != (bool)gSavedSettings.getBOOL("EditCameraMovement")) + { + gSavedSettings.setBOOL("EditCameraMovement", edit_camera_movement); + } } } else |