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

LLAgentCamera transition (1/2)

Browse Source
This commit is contained in:
Shyotl
2011-06-07 21:35:10 -05:00
parent 278cfbdb67
commit a07e399801
89 changed files with 616 additions and 572 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llhoverview.cpp
View File

@@ -47,6 +47,7 @@
// Viewer includes
#include "llagent.h"
#include "llagentcamera.h"
#include "llavatarnamecache.h"
#include "llcachename.h"
#include "llviewercontrol.h"
@@ -120,7 +121,7 @@ void LLHoverView::updateHover(LLTool* current_tool)
BOOL picking_tool = ( current_tool == LLToolPie::getInstance()
|| current_tool == LLToolSelectLand::getInstance() );
mUseHover = !gAgent.cameraMouselook()
mUseHover = !gAgentCamera.cameraMouselook()
&& picking_tool
&& !mTyping;
if (mUseHover)
@@ -735,11 +736,11 @@ void LLHoverView::draw()
LLViewerObject *hover_object = getLastHoverObject();
if (hover_object->isAvatar())
{
gAgent.setLookAt(LOOKAT_TARGET_HOVER, getLastHoverObject(), LLVector3::zero);
gAgentCamera.setLookAt(LOOKAT_TARGET_HOVER, getLastHoverObject(), LLVector3::zero);
}
else
{
gAgent.setLookAt(LOOKAT_TARGET_HOVER, getLastHoverObject(), mHoverOffset);
gAgentCamera.setLookAt(LOOKAT_TARGET_HOVER, getLastHoverObject(), mHoverOffset);
}
}
}