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

make sure to reset the 'currently zooming' flag from mouselook zoom on teleport. Stabilizes fix for FIRE-3394

ziree 2011-11-10 13:15:21 +01:00
parent 601ad80ece
commit ffa55e6908
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llviewerdisplay.cpp
View File

@ -389,6 +389,10 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
// replicating the behavior here. -Zi
LLViewerCamera::getInstance()->setDefaultFOV(DEFAULT_FIELD_OF_VIEW);
gSavedSettings.setF32("CameraAngle", LLViewerCamera::getInstance()->getView());
// also, reset the marker for "currently zooming" in the mouselook zoom settings. -Zi
LLVector3 vTemp=gSavedSettings.getVector3("_NACL_MLFovValues");
vTemp.mV[2]=0.0f;
gSavedSettings.setVector3("_NACL_MLFovValues",vTemp);
}
gTeleportDisplayTimer.reset();