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

SL-12904 Temporarily use LLSD to avoid crashes on older viewers

master
Mnikolenko Productengine 2020-04-23 13:22:27 +03:00
parent 74d6e6b65c
commit 2ea5c5986a
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,7 +18,7 @@
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Quaternion</string>
<string>LLSD</string>
<key>Value</key>
<array>
<real>0</real>

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

@ -18,7 +18,7 @@
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Quaternion</string>
<string>LLSD</string>
<key>Value</key>
<array>
<real>0</real>

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

@ -18,7 +18,7 @@
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Quaternion</string>
<string>LLSD</string>
<key>Value</key>
<array>
<real>0</real>

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

@ -4404,7 +4404,7 @@
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Quaternion</string>
<string>LLSD</string>
<key>Value</key>
<array>
<real>0</real>

2
indra/newview/llfloatercamera.cpp
View File

@ -569,7 +569,7 @@ void LLFloaterCamera::switchToPreset(const std::string& name)
if (isAgentAvatarValid() && gAgentAvatarp->getParent())
{
LLQuaternion sit_rot = gSavedSettings.getQuaternion("AvatarSitRotation");
LLQuaternion sit_rot(gSavedSettings.getLLSD("AvatarSitRotation"));
if (sit_rot != LLQuaternion())
{
gAgent.rotate(~gAgent.getFrameAgent().getQuaternion());

2
indra/newview/llfloatersavecamerapreset.cpp
View File

@ -106,7 +106,7 @@ void LLFloaterSaveCameraPreset::onBtnSave()
{
if (isAgentAvatarValid() && gAgentAvatarp->getParent())
{
gSavedSettings.setQuaternion("AvatarSitRotation", gAgent.getFrameAgent().getQuaternion());
gSavedSettings.setLLSD("AvatarSitRotation", gAgent.getFrameAgent().getQuaternion().getValue());
}
if (gAgentCamera.isJoystickCameraUsed())
{