FIRE-15085: Object view button on camera tools not working Firestorm_4.6.9

Mon, 08 Dec 2014 09:33:24 +0100

author
Ansariel
date
Mon, 08 Dec 2014 09:33:24 +0100
branch
Firestorm_4.6.9
changeset 43062
cec586b490f6
parent 43061
4e925b1eb178
child 43063
32a493c57d99

FIRE-15085: Object view button on camera tools not working

indra/newview/llfloatercamera.cpp file | annotate | diff | revisions
     1.1 --- a/indra/newview/llfloatercamera.cpp	Fri Nov 21 22:48:14 2014 +0100
     1.2 +++ b/indra/newview/llfloatercamera.cpp	Mon Dec 08 09:33:24 2014 +0100
     1.3 @@ -661,15 +661,18 @@
     1.4  // 		if (camera_floater)
     1.5  // 			camera_floater->switchMode(CAMERA_CTRL_MODE_FREE_CAMERA);
     1.6  // 	}
     1.7 -	else if ("object_view" == name && camera_floater)
     1.8 +	else if ("object_view" == name)
     1.9  	{
    1.10 -		if (camera_floater->mUseFlatUI)
    1.11 +		if (camera_floater)
    1.12  		{
    1.13 -			camera_floater->mCurrMode == CAMERA_CTRL_MODE_FREE_CAMERA ? camera_floater->switchMode(CAMERA_CTRL_MODE_PAN) : camera_floater->switchMode(CAMERA_CTRL_MODE_FREE_CAMERA);
    1.14 -		}
    1.15 -		else
    1.16 -		{
    1.17 -			camera_floater->switchMode(CAMERA_CTRL_MODE_FREE_CAMERA);
    1.18 +			if (camera_floater->mUseFlatUI)
    1.19 +			{
    1.20 +				camera_floater->mCurrMode == CAMERA_CTRL_MODE_FREE_CAMERA ? camera_floater->switchMode(CAMERA_CTRL_MODE_PAN) : camera_floater->switchMode(CAMERA_CTRL_MODE_FREE_CAMERA);
    1.21 +			}
    1.22 +			else
    1.23 +			{
    1.24 +				camera_floater->switchMode(CAMERA_CTRL_MODE_FREE_CAMERA);
    1.25 +			}
    1.26  		}
    1.27  	}
    1.28  // </AW: Flat cam floater>
    1.29 @@ -699,15 +702,18 @@
    1.30  	{
    1.31  		gAgentCamera.changeCameraToMouselook();
    1.32  	}
    1.33 -	else if ("object_view" == name && camera_floater)
    1.34 +	else if ("object_view" == name)
    1.35  	{
    1.36 -		if (camera_floater->mUseFlatUI)
    1.37 +		if (camera_floater)
    1.38  		{
    1.39 -			camera_floater->mCurrMode == CAMERA_CTRL_MODE_FREE_CAMERA ? camera_floater->switchMode(CAMERA_CTRL_MODE_PAN) : camera_floater->switchMode(CAMERA_CTRL_MODE_FREE_CAMERA);
    1.40 -		}
    1.41 -		else
    1.42 -		{
    1.43 -			camera_floater->switchMode(CAMERA_CTRL_MODE_FREE_CAMERA);
    1.44 +			if (camera_floater->mUseFlatUI)
    1.45 +			{
    1.46 +				camera_floater->mCurrMode == CAMERA_CTRL_MODE_FREE_CAMERA ? camera_floater->switchMode(CAMERA_CTRL_MODE_PAN) : camera_floater->switchMode(CAMERA_CTRL_MODE_FREE_CAMERA);
    1.47 +			}
    1.48 +			else
    1.49 +			{
    1.50 +				camera_floater->switchMode(CAMERA_CTRL_MODE_FREE_CAMERA);
    1.51 +			}
    1.52  		}
    1.53  	}
    1.54  	else

mercurial