Merge remote-tracking branch 'imprudence/exp' into exp

Conflicts (for future reference):
	linden/indra/llcommon/llstring.cpp
	linden/indra/newview/llpanelnetwork.cpp
	linden/indra/newview/llselectmgr.cpp
	linden/indra/newview/llstartup.cpp
	linden/indra/newview/lltoolmgr.cpp
	linden/indra/newview/llvoavatar.cpp

1 files changed, 130 insertions, 9 deletions

diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp
index 7bc57f8..85a1b36 100644
--- a/linden/indra/newview/llagent.cpp
+++ b/linden/indra/newview/llagent.cpp
@@ -56,6 +56,7 @@
 #include "llsdutil.h"
 //#include "vmath.h"
 
+#include "hippogridmanager.h"
 #include "imageids.h"
 #include "llbox.h"
 #include "llbutton.h"
@@ -2734,14 +2735,24 @@ void LLAgent::updateLookAt(const S32 mouse_x, const S32 mouse_y)
                 }
                 else if (cameraThirdPerson())
                 {
-                        // range from -.5 to .5
-                        F32 x_from_center = 
-                                ((F32) mouse_x / (F32) gViewerWindow->getWindowWidth() ) - 0.5f;
-                        F32 y_from_center = 
-                                ((F32) mouse_y / (F32) gViewerWindow->getWindowHeight() ) - 0.5f;
-
-                        frameCamera.yaw( - x_from_center * gSavedSettings.getF32("YawFromMousePosition") * DEG_TO_RAD);
-                        frameCamera.pitch( - y_from_center * gSavedSettings.getF32("PitchFromMousePosition") * DEG_TO_RAD);
+                        if (gSavedSettings.getBOOL("HeadFollowsMouse"))
+                        {
+                                // range from -.5 to .5
+                                F32 x_from_center = 
+                                        ((F32) mouse_x / (F32) gViewerWindow->getWindowWidth() ) - 0.5f;
+                                F32 y_from_center = 
+                                        ((F32) mouse_y / (F32) gViewerWindow->getWindowHeight() ) - 0.5f;
+
+                                frameCamera.yaw( - x_from_center * gSavedSettings.getF32("YawFromMousePosition")
+                                                        * DEG_TO_RAD);
+                                frameCamera.pitch( - y_from_center * gSavedSettings.getF32("PitchFromMousePosition")
+                                                        * DEG_TO_RAD);
+                        }
+                        else
+                        {
+                                frameCamera.yaw( 0.f );
+                                frameCamera.pitch( 0.f );
+                        }
                         lookAtType = LOOKAT_TARGET_FREELOOK;
                 }
 
@@ -4772,6 +4783,116 @@ void LLAgent::lookAtLastChat()
         }
 }
 
+void LLAgent::lookAtObject(LLUUID object_id, ECameraPosition camera_pos)
+{
+        // Block if camera is animating or not in normal third person camera mode
+        if (mCameraAnimating || !cameraThirdPerson())
+        {
+                return;
+        }
+
+        LLViewerObject *chatter = gObjectList.findObject(object_id);
+        if (chatter)
+        {
+                LLVector3 delta_pos;
+                if (chatter->isAvatar())
+                {
+                        LLVOAvatar *chatter_av = (LLVOAvatar*)chatter;
+                        if (!mAvatarObject.isNull() && chatter_av->mHeadp)
+                        {
+                                delta_pos = chatter_av->mHeadp->getWorldPosition() - mAvatarObject->mHeadp->getWorldPosition();
+                        }
+                        else
+                        {
+                                delta_pos = chatter->getPositionAgent() - getPositionAgent();
+                        }
+                        delta_pos.normVec();
+
+                        setControlFlags(AGENT_CONTROL_STOP);
+
+                        changeCameraToThirdPerson();
+
+                        LLVector3 new_camera_pos = mAvatarObject->mHeadp->getWorldPosition();
+                        LLVector3 left = delta_pos % LLVector3::z_axis;
+                        left.normVec();
+                        LLVector3 up = left % delta_pos;
+                        up.normVec();
+                        new_camera_pos -= delta_pos * 0.4f;
+                        new_camera_pos += left * 0.3f;
+                        new_camera_pos += up * 0.2f;
+
+                        F32 radius = chatter_av->getVObjRadius();
+                        LLVector3d view_dist(radius, radius, 0.0f);
+
+                        if (chatter_av->mHeadp)
+                        {
+                                setFocusGlobal(getPosGlobalFromAgent(chatter_av->mHeadp->getWorldPosition()), object_id);
+                                mCameraFocusOffsetTarget = getPosGlobalFromAgent(new_camera_pos) - gAgent.getPosGlobalFromAgent(chatter_av->mHeadp->getWorldPosition());
+
+                                switch(camera_pos)
+                                {
+                                        case CAMERA_POSITION_SELF:
+                                                mCameraFocusOffsetTarget = getPosGlobalFromAgent(new_camera_pos) - gAgent.getPosGlobalFromAgent(chatter_av->mHeadp->getWorldPosition());
+                                                break;
+                                        case CAMERA_POSITION_OBJECT:
+                                                mCameraFocusOffsetTarget =  view_dist;
+                                                break;
+                                }
+                        }
+                        else
+                        {
+                                setFocusGlobal(chatter->getPositionGlobal(), object_id);
+                                mCameraFocusOffsetTarget = getPosGlobalFromAgent(new_camera_pos) - chatter->getPositionGlobal();
+
+                                switch(camera_pos)
+                                {
+                                        case CAMERA_POSITION_SELF:
+                                                mCameraFocusOffsetTarget = getPosGlobalFromAgent(new_camera_pos) - chatter->getPositionGlobal();
+                                                break;
+                                        case CAMERA_POSITION_OBJECT:
+                                                mCameraFocusOffsetTarget = view_dist;
+                                                break;
+                                }
+                        }
+                        setFocusOnAvatar(FALSE, TRUE);
+                }
+                else
+                {
+                        delta_pos = chatter->getRenderPosition() - getPositionAgent();
+                        delta_pos.normVec();
+
+                        setControlFlags(AGENT_CONTROL_STOP);
+
+                        changeCameraToThirdPerson();
+
+                        LLVector3 new_camera_pos = mAvatarObject->mHeadp->getWorldPosition();
+                        LLVector3 left = delta_pos % LLVector3::z_axis;
+                        left.normVec();
+                        LLVector3 up = left % delta_pos;
+                        up.normVec();
+                        new_camera_pos -= delta_pos * 0.4f;
+                        new_camera_pos += left * 0.3f;
+                        new_camera_pos += up * 0.2f;
+
+                        setFocusGlobal(chatter->getPositionGlobal(), object_id);
+
+                        switch(camera_pos)
+                        {
+                                case CAMERA_POSITION_SELF:
+                                        mCameraFocusOffsetTarget = getPosGlobalFromAgent(new_camera_pos) - chatter->getPositionGlobal();
+                                        break;
+                                case CAMERA_POSITION_OBJECT:
+                                        F32 radius = chatter->getVObjRadius();
+                                        LLVector3d view_dist(radius, radius, 0.0f);
+                                        mCameraFocusOffsetTarget = view_dist;
+                                        break;
+                        }
+
+                        setFocusOnAvatar(FALSE, TRUE);
+                }
+        }
+}
+
 const F32 SIT_POINT_EXTENTS = 0.2f;
 
 void LLAgent::setStartPosition( U32 location_id )
@@ -5480,7 +5601,7 @@ void LLAgent::getName(std::string& name)
         }
         else
         {
-                name = gSavedSettings.getString("FirstName") + " " + gSavedSettings.getString("LastName");
+                name = gHippoGridManager->getCurrentGrid()->getFirstName() + " " + gHippoGridManager->getCurrentGrid()->getLastName();
         }
 }