diff options
author | Xiaohong Bao <bao@lindenlab.com> | 2013-08-19 16:09:28 -0600 |
---|---|---|
committer | Xiaohong Bao <bao@lindenlab.com> | 2013-08-19 16:09:28 -0600 |
commit | d8c02bf06250015b8cb0bcc9c0d8445cfb6acf1c (patch) | |
tree | 2e7966158d684828422c2b9f0d4129fa1ef1b395 /indra/newview/llviewermessage.cpp | |
parent | 4290365ebbf5505bee4fbed8043996fa7687fd03 (diff) | |
parent | 171089207b528ab80a954292c127ba77254ee927 (diff) |
Merge
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
-rwxr-xr-x | indra/newview/llviewermessage.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 6c435bf147..348b557147 100755 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -7219,8 +7219,12 @@ void process_script_teleport_request(LLMessageSystem* msg, void**) LLFloaterWorldMap* instance = LLFloaterWorldMap::getInstance(); if(instance) { - instance->trackURL( - sim_name, (S32)pos.mV[VX], (S32)pos.mV[VY], (S32)pos.mV[VZ]); + llinfos << "Object named " << object_name + << " is offering TP to region " + << sim_name << " position " << pos + << llendl; + + instance->trackURL(sim_name, (S32)pos.mV[VX], (S32)pos.mV[VY], (S32)pos.mV[VZ]); LLFloaterReg::showInstance("world_map", "center"); } |