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

SL-20277 ignore both settings when loading camera preset

master
Maxim Nikolenko 2023-11-13 19:33:18 +02:00 committed by GitHub
parent aff01e2fd4
commit 7e66f6ca18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
indra/newview/llpresetsmanager.cpp
View File

@ -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