diff --git a/indra/newview/app_settings/camera/Front.xml b/indra/newview/app_settings/camera/Front.xml index 39f44e11a841a8c420096924cfaf5529ea8e109a..f9f615c4a7bfd8e1022201547e948604ea2e07f1 100644 --- a/indra/newview/app_settings/camera/Front.xml +++ b/indra/newview/app_settings/camera/Front.xml @@ -18,7 +18,7 @@ <key>Persist</key> <integer>1</integer> <key>Type</key> - <string>LLSD</string> + <string>Quaternion</string> <key>Value</key> <array> <real>0</real> diff --git a/indra/newview/app_settings/camera/Rear.xml b/indra/newview/app_settings/camera/Rear.xml index 8dc36353ce20a3ea3eaa6405c45c07b043f33956..a084f83bfe144697578caaeb913cee952dc04e1c 100644 --- a/indra/newview/app_settings/camera/Rear.xml +++ b/indra/newview/app_settings/camera/Rear.xml @@ -18,7 +18,7 @@ <key>Persist</key> <integer>1</integer> <key>Type</key> - <string>LLSD</string> + <string>Quaternion</string> <key>Value</key> <array> <real>0</real> diff --git a/indra/newview/app_settings/camera/Side.xml b/indra/newview/app_settings/camera/Side.xml index 089ab93a8f67d3033b5a83586cf22d5441d4dbf9..5db5b164bdbb99c9876a4d23a67cc183b6defcad 100644 --- a/indra/newview/app_settings/camera/Side.xml +++ b/indra/newview/app_settings/camera/Side.xml @@ -18,7 +18,7 @@ <key>Persist</key> <integer>1</integer> <key>Type</key> - <string>LLSD</string> + <string>Quaternion</string> <key>Value</key> <array> <real>0</real> diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 0d2c009bc2fc2f9ad11fb2331a1d6c9990c92546..0d5ca75c5f5018f96c39bffec0e44ef50df15994 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4738,7 +4738,7 @@ <key>Persist</key> <integer>1</integer> <key>Type</key> - <string>LLSD</string> + <string>Quaternion</string> <key>Value</key> <array> <real>0</real> diff --git a/indra/newview/llfloatercamera.cpp b/indra/newview/llfloatercamera.cpp index 941902c1faf91c5befee220b48895a81723aeb85..ddb7b35404a58039bfb8d8ea74776d2472b5a0ce 100644 --- a/indra/newview/llfloatercamera.cpp +++ b/indra/newview/llfloatercamera.cpp @@ -579,7 +579,7 @@ void LLFloaterCamera::switchToPreset(const std::string& name) if (isAgentAvatarValid() && gAgentAvatarp->getParent()) { - LLQuaternion sit_rot(gSavedSettings.getLLSD("AvatarSitRotation")); + LLQuaternion sit_rot(gSavedSettings.getQuaternion("AvatarSitRotation")); if (sit_rot != LLQuaternion()) { gAgent.rotate(~gAgent.getFrameAgent().getQuaternion()); diff --git a/indra/newview/llfloatersavecamerapreset.cpp b/indra/newview/llfloatersavecamerapreset.cpp index 11809f9c824369c5793b7027bede4b48f441a1d4..5704a7a525c7bb21d0537e6bb3cf4af7c7a9862c 100644 --- a/indra/newview/llfloatersavecamerapreset.cpp +++ b/indra/newview/llfloatersavecamerapreset.cpp @@ -106,7 +106,7 @@ void LLFloaterSaveCameraPreset::onBtnSave() { if (isAgentAvatarValid() && gAgentAvatarp->getParent()) { - gSavedSettings.setLLSD("AvatarSitRotation", gAgent.getFrameAgent().getQuaternion().getValue()); + gSavedSettings.setQuaternion("AvatarSitRotation", gAgent.getFrameAgent().getQuaternion()); } if (gAgentCamera.isJoystickCameraUsed()) {