diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-14 13:55:00 -0800 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-14 13:55:00 -0800 |
| commit | 04fe0399443cf4a5852e94cd3950ba1fd2d50562 (patch) | |
| tree | 805e57d9bc12d869e87994380d5b023137fef48f /indra/newview/llagent.cpp | |
| parent | af2cbcee129911cb4e1d25fbd710d755c13b0282 (diff) | |
Backed out changeset d5b761982e63
This got pushed too early - sorry. Sigh.
Diffstat (limited to 'indra/newview/llagent.cpp')
| -rw-r--r-- | indra/newview/llagent.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 5ea253709c..5e2e374df6 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -514,8 +514,6 @@ void LLAgent::resetView(BOOL reset_camera, BOOL change_camera) } setFocusOnAvatar(TRUE, ANIMATE); - - mCameraFOVZoomFactor = 0.f; } mHUDTargetZoom = 1.f; @@ -3586,7 +3584,7 @@ F32 LLAgent::calcCameraFOVZoomFactor() { return 0.f; } - else if (mFocusObject.notNull() && !mFocusObject->isAvatar() && !mFocusOnAvatar) + else if (mFocusObject.notNull() && !mFocusObject->isAvatar()) { // don't FOV zoom on mostly transparent objects LLVector3 focus_offset = mFocusObjectOffset; @@ -5159,11 +5157,6 @@ BOOL LLAgent::setUserGroupFlags(const LLUUID& group_id, BOOL accept_notices, BOO return FALSE; } -BOOL LLAgent::canJoinGroups() const -{ - return mGroups.count() < MAX_AGENT_GROUPS; -} - LLQuaternion LLAgent::getHeadRotation() { if (mAvatarObject.isNull() || !mAvatarObject->mPelvisp || !mAvatarObject->mHeadp) |