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

FIRE-29950: Re-add weird legacy object view camera toggle

master
Ansariel 2020-07-31 19:54:04 +02:00
parent c1012c51c1
commit c77b39771e
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llfloatercamera.cpp
View File

@ -578,7 +578,10 @@ void LLFloaterCamera::onClickCameraItem(const LLSD& param)
LLFloaterCamera* camera_floater = LLFloaterCamera::findInstance();
if (camera_floater)
{
camera_floater->switchMode(CAMERA_CTRL_MODE_FREE_CAMERA);
// <FS:Ansariel> FIRE-29950: Re-add weird legacy object view camera toggle
//camera_floater->switchMode(CAMERA_CTRL_MODE_FREE_CAMERA);
camera_floater->mCurrMode == CAMERA_CTRL_MODE_FREE_CAMERA ? camera_floater->switchMode(CAMERA_CTRL_MODE_PAN) : camera_floater->switchMode(CAMERA_CTRL_MODE_FREE_CAMERA);
// </FS:Ansariel>
camera_floater->updateItemsSelection();
camera_floater->fromFreeToPresets();
}
@ -587,7 +590,10 @@ void LLFloaterCamera::onClickCameraItem(const LLSD& param)
camera_floater = LLFloaterCamera::findPhototoolsInstance();
if (camera_floater)
{
camera_floater->switchMode(CAMERA_CTRL_MODE_FREE_CAMERA);
// <FS:Ansariel> FIRE-29950: Re-add weird legacy object view camera toggle
//camera_floater->switchMode(CAMERA_CTRL_MODE_FREE_CAMERA);
camera_floater->mCurrMode == CAMERA_CTRL_MODE_FREE_CAMERA ? camera_floater->switchMode(CAMERA_CTRL_MODE_PAN) : camera_floater->switchMode(CAMERA_CTRL_MODE_FREE_CAMERA);
// </FS:Ansariel>
camera_floater->updateItemsSelection();
camera_floater->fromFreeToPresets();
}