Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Follow fix and clean-up

Browse Source
This commit is contained in:
Siana Gearz
2013-01-09 00:07:17 +01:00
parent cd27184332
commit 54a53b574f
6 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llagentcamera.cpp
View File

@@ -161,7 +161,6 @@ LLAgentCamera::LLAgentCamera() :
mFocusObjectDist(0.f),
mFocusObjectOffset(),
mFocusDotRadius( 0.1f ), // meters
mTrackFocusObject(TRUE),
mUIOffset(0.f),
mAtKey(0), // Either 1, 0, or -1... indicates that movement-key is pressed
@@ -225,7 +224,6 @@ void LLAgentCamera::init()
mCurrentCameraDistance = getCameraOffsetInitial().magVec() * gSavedSettings.getF32("CameraOffsetScale");
mTargetCameraDistance = mCurrentCameraDistance;
mCameraZoomFraction = 1.f;
mTrackFocusObject = gSavedSettings.getBOOL("TrackFocusObject");
mInitialized = true;
}
@@ -1623,11 +1621,9 @@ LLVector3d LLAgentCamera::calcFocusPositionTargetGlobal()
{
LLDrawable* drawablep = mFocusObject->mDrawable;
if (mTrackFocusObject &&
drawablep &&
drawablep->isActive())
if (gSavedSettings.getBOOL("TrackFocusObject") && drawablep)
{
if (!mFocusObject->isAvatar())
if (drawablep->isActive() && !mFocusObject->isAvatar())
{
if (mFocusObject->isSelected())
{

2
indra/newview/llagentcamera.h
View File

@@ -211,7 +211,6 @@ public:
void setCameraPosAndFocusGlobal(const LLVector3d& pos, const LLVector3d& focus, const LLUUID &object_id);
void clearFocusObject();
void setFocusObject(LLViewerObject* object);
void setObjectTracking(BOOL track) { mTrackFocusObject = track; }
const LLVector3d &getFocusGlobal() const { return mFocusGlobal; }
const LLVector3d &getFocusTargetGlobal() const { return mFocusTargetGlobal; }
private:
@@ -224,7 +223,6 @@ private:
F32 mFocusObjectDist;
LLVector3 mFocusObjectOffset;
F32 mFocusDotRadius; // Meters
BOOL mTrackFocusObject;
//--------------------------------------------------------------------
// Lookat / Pointat

1
indra/newview/llmaniprotate.cpp
View File

@@ -500,7 +500,6 @@ BOOL LLManipRotate::handleMouseUp(S32 x, S32 y, MASK mask)
// Might have missed last update due to timing.
LLSelectMgr::getInstance()->sendMultipleUpdate( UPD_ROTATION | UPD_POSITION );
LLSelectMgr::getInstance()->enableSilhouette(TRUE);
//gAgent.setObjectTracking(gSavedSettings.getBOOL("TrackFocusObject"));
LLSelectMgr::getInstance()->updateSelectionCenter();
LLSelectMgr::getInstance()->saveSelectedObjectTransform(SELECT_ACTION_TYPE_PICK);

1
indra/newview/llmanipscale.cpp
View File

@@ -385,7 +385,6 @@ BOOL LLManipScale::handleMouseUp(S32 x, S32 y, MASK mask)
// Might have missed last update due to UPDATE_DELAY timing
LLSelectMgr::getInstance()->sendMultipleUpdate( mLastUpdateFlags );
//gAgent.setObjectTracking(gSavedSettings.getBOOL("TrackFocusObject"));
LLSelectMgr::getInstance()->saveSelectedObjectTransform(SELECT_ACTION_TYPE_PICK);
}
return LLManip::handleMouseUp(x, y, mask);

1
indra/newview/llmaniptranslate.cpp
View File

@@ -1077,7 +1077,6 @@ BOOL LLManipTranslate::handleMouseUp(S32 x, S32 y, MASK mask)
mInSnapRegime = FALSE;
LLSelectMgr::getInstance()->saveSelectedObjectTransform(SELECT_ACTION_TYPE_PICK);
//gAgent.setObjectTracking(gSavedSettings.getBOOL("TrackFocusObject"));
}
return LLManip::handleMouseUp(x, y, mask);

2
indra/newview/lltoolgrab.cpp
View File

@@ -983,8 +983,6 @@ BOOL LLToolGrab::handleMouseUp(S32 x, S32 y, MASK mask)
gGrabTransientTool = NULL;
}
//gAgent.setObjectTracking(gSavedSettings.getBOOL("TrackFocusObject"));
return TRUE;
}