diff options
author | Nyx Linden <nyx@lindenlab.com> | 2013-06-18 16:15:03 -0400 |
---|---|---|
committer | Nyx Linden <nyx@lindenlab.com> | 2013-06-18 16:15:03 -0400 |
commit | 69b062b90889fe581de0d10d60b979cb7883b4a0 (patch) | |
tree | 6286fc967bc0f551a9e67b8377bdfbc743f090b2 /indra/newview/llviewermessage.cpp | |
parent | c67db8e75511de879c69de0faf06a88ac3cc731d (diff) | |
parent | 425ff28e4bc38ba3f7bfeade4a72dce4eba63b54 (diff) |
merge with viewer-release
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
-rwxr-xr-x | indra/newview/llviewermessage.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index ace16396db..751a9456c9 100755 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -3964,6 +3964,8 @@ void process_teleport_finish(LLMessageSystem* msg, void**) gAgent.setTeleportState( LLAgent::TELEPORT_MOVING ); gAgent.setTeleportMessage(LLAgent::sTeleportProgressMessages["contacting"]); + LL_DEBUGS("CrossingCaps") << "Calling setSeedCapability from process_teleport_finish(). Seed cap == " + << seedCap << LL_ENDL; regionp->setSeedCapability(seedCap); // Don't send camera updates to the new region until we're @@ -4218,6 +4220,9 @@ void process_crossed_region(LLMessageSystem* msg, void**) send_complete_agent_movement(sim_host); LLViewerRegion* regionp = LLWorld::getInstance()->addRegion(region_handle, sim_host); + + LL_DEBUGS("CrossingCaps") << "Calling setSeedCapability from process_crossed_region(). Seed cap == " + << seedCap << LL_ENDL; regionp->setSeedCapability(seedCap); } |