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

Updated LLViewerParcelMgr.

Browse Source 
Added LLViewerParcelMgr::setTeleportFinishedCallback, setTeleportFailedCallback. Not hooked into anything yet, however.
agentCanBuild, agentCanFly, etc, renamed.
This commit is contained in:
Shyotl
2011-08-19 02:15:22 -05:00
parent 13e0359c6e
commit 863ab7fa6b
7 changed files with 193 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llviewermessage.cpp
View File

@@ -6100,6 +6100,9 @@ void process_teleport_failed(LLMessageSystem *msg, void**)
LLNotifications::instance().add("CouldNotTeleportReason", args);
// Let the interested parties know that teleport failed.
LLViewerParcelMgr::getInstance()->onTeleportFailed();
if( gAgent.getTeleportState() != LLAgent::TELEPORT_NONE )
{
gAgent.setTeleportState( LLAgent::TELEPORT_NONE );
@@ -6159,9 +6162,14 @@ void process_teleport_local(LLMessageSystem *msg,void**)
}
// send camera update to new region
//gAgent.updateCamera();
gAgentCamera.updateCamera();
send_agent_update(TRUE, TRUE);
// Let the interested parties know we've teleported.
// Vadim *HACK: Agent position seems to get reset (to render position?)
// on each frame, so we have to pass the new position manually.
LLViewerParcelMgr::getInstance()->onTeleportFinished(true, gAgent.getPosGlobalFromAgent(pos));
}
void send_simple_im(const LLUUID& to_id,