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/llviewerdisplay.cpp
View File

@@ -364,9 +364,9 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot, boo
const F32 TELEPORT_ARRIVAL_DELAY = 2.f; // Time to preload the world before raising the curtain after we've actually already arrived.
S32 attach_count = 0;
if (gAgent.getAvatarObject())
if (gAgentAvatarp)
{
attach_count = gAgent.getAvatarObject()->getAttachmentCount();
attach_count = gAgentAvatarp->getAttachmentCount();
}
F32 teleport_save_time = TELEPORT_EXPIRY + TELEPORT_EXPIRY_PER_ATTACHMENT * attach_count;
F32 teleport_elapsed = gTeleportDisplayTimer.getElapsedTimeF32();
@@ -1128,7 +1128,7 @@ LLRect get_whole_screen_region()
bool get_hud_matrices(const LLRect& screen_region, glh::matrix4f &proj, glh::matrix4f &model)
{
LLVOAvatar* my_avatarp = gAgent.getAvatarObject();
LLVOAvatar* my_avatarp = gAgentAvatarp;
if (my_avatarp && my_avatarp->hasHUDAttachment())
{
F32 zoom_level = gAgentCamera.mHUDCurZoom;