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

SL-12424 WIP Save mousewheel zoom fraction in preset

master
maxim_productengine 2019-12-18 11:26:22 +02:00
parent b0265f9756
commit abd5277a7b
6 changed files with 48 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/app_settings/camera/Front.xml
View File

@ -63,6 +63,17 @@
<key>Value</key>
<real>1</real>
</map>
<key>CameraZoomFraction</key>
<map>
<key>Comment</key>
<string>Mousewheel driven fraction of zoom</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>0.9</real>
</map>
<key>EditCameraMovement</key>
<map>
<key>Comment</key>

11
indra/newview/app_settings/camera/Rear.xml
View File

@ -63,6 +63,17 @@
<key>Value</key>
<real>1</real>
</map>
<key>CameraZoomFraction</key>
<map>
<key>Comment</key>
<string>Mousewheel driven fraction of zoom</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>0.9</real>
</map>
<key>EditCameraMovement</key>
<map>
<key>Comment</key>

11
indra/newview/app_settings/camera/Side.xml
View File

@ -63,6 +63,17 @@
<key>Value</key>
<real>1</real>
</map>
<key>CameraZoomFraction</key>
<map>
<key>Comment</key>
<string>Mousewheel driven fraction of zoom</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>0.9</real>
</map>
<key>EditCameraMovement</key>
<map>
<key>Comment</key>

11
indra/newview/app_settings/settings.xml
View File

@ -1525,6 +1525,17 @@
<key>Value</key>
<real>1.0</real>
</map>
<key>CameraZoomFraction</key>
<map>
<key>Comment</key>
<string>Mousewheel driven fraction of zoom</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>0.9</real>
</map>
<key>CameraPosOnLogout</key>
<map>
<key>Comment</key>

1
indra/newview/llfloatercamera.cpp
View File

@ -565,6 +565,7 @@ void LLFloaterCamera::switchToPreset(const std::string& name)
{
LLPresetsManager::getInstance()->loadPreset(PRESETS_CAMERA, name);
}
gAgentCamera.setCameraZoomFraction(gSavedSettings.getF32("CameraZoomFraction"));
LLFloaterCamera* camera_floater = LLFloaterCamera::findInstance();
if (camera_floater)

4
indra/newview/llpresetsmanager.cpp
View File

@ -236,7 +236,6 @@ void LLPresetsManager::getControlNames(std::vector<std::string>& names)
("AppearanceCameraMovement")
// From llagentcamera.cpp
("CameraOffsetBuild")
("CameraOffsetScale")
("TrackFocusObject")
("CameraOffsetRearView")
("FocusOffsetRearView")
@ -288,6 +287,9 @@ bool LLPresetsManager::savePreset(const std::string& subdirectory, std::string n
name_list.clear();
getControlNames(name_list);
name_list.push_back("PresetCameraActive");
gSavedSettings.setF32("CameraZoomFraction", gAgentCamera.getCameraZoomFraction());
name_list.push_back("CameraZoomFraction");
}
else
{