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

Beginning to pull LLVOAvatarSelf out from LLVOAvatar.

Browse Source
This commit is contained in:
Shyotl
2011-10-02 02:51:10 -05:00
parent 21f39471f1
commit 74dc875a27
68 changed files with 1624 additions and 1248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/lltoolfocus.cpp
View File

@@ -55,7 +55,7 @@
#include "llviewercamera.h"
#include "llviewerobject.h"
#include "llviewerwindow.h"
#include "llvoavatar.h"
#include "llvoavatarself.h"
#include "llmorphview.h"
// Globals
@@ -171,7 +171,7 @@ void LLToolCamera::pickCallback(const LLPickInfo& pick_info)
BOOL good_customize_avatar_hit = FALSE;
if( hit_obj )
{
LLVOAvatar* avatar = gAgent.getAvatarObject();
LLVOAvatar* avatar = gAgentAvatarp;
if( hit_obj == avatar)
{
// It's you
@@ -222,7 +222,7 @@ void LLToolCamera::pickCallback(const LLPickInfo& pick_info)
gAgentCamera.cameraThirdPerson() &&
gViewerWindow->getLeftMouseDown() &&
!freeze_time &&
(hit_obj == gAgent.getAvatarObject() ||
(hit_obj == gAgentAvatarp ||
(hit_obj && hit_obj->isAttachment() && LLVOAvatar::findAvatarFromAttachment(hit_obj)->isSelf())))
{
LLToolCamera::getInstance()->mMouseSteering = TRUE;