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

Merge branch 'master' of git://github.com/siana/SingularityViewer

Browse Source
This commit is contained in:
Lirusaito
2012-01-07 15:38:58 -05:00
parent 900d063d4f b911e86b02
commit 626a94cf8f
19 changed files with 696 additions and 624 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
indra/newview/llviewermessage.cpp
View File

@@ -3900,8 +3900,7 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**)
std::string version_channel;
msg->getString("SimData", "ChannelVersion", version_channel);
LLVOAvatar* avatarp = gAgentAvatarp;
if (!avatarp)
if (!isAgentAvatarValid())
{
// Could happen if you were immediately god-teleported away on login,
// maybe other cases. Continue, but warn.
@@ -3962,7 +3961,7 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**)
gAgent.sendAgentSetAppearance();
// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a)
if ( (avatarp) && (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) )
if ( (gAgentAvatarp) && (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) )
// [/RLVa:KB]
// if (avatarp)
{
@@ -3972,9 +3971,9 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**)
LLFloaterChat::addChatHistory(chat);
// Set the new position
avatarp->setPositionAgent(agent_pos);
avatarp->clearChat();
avatarp->slamPosition();
gAgentAvatarp->setPositionAgent(agent_pos);
gAgentAvatarp->clearChat();
gAgentAvatarp->slamPosition();
}
// add teleport destination to the list of visited places
@@ -4048,9 +4047,9 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**)
gAgent.clearBusy();
}
if (avatarp)
if (isAgentAvatarValid())
{
avatarp->mFootPlane.clearVec();
gAgentAvatarp->mFootPlane.clearVec();
}
// send walk-vs-run status