diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-08-19 16:12:07 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-08-19 16:12:07 -0600 |
| commit | 1616b73ef30bcb3e99be68fb7ccc05f0be78ddf6 (patch) | |
| tree | e22c94948ed8d8c7f35422fc064172ea3662b264 /indra/newview/llviewermessage.cpp | |
| parent | ea45b8acd25785bd2789c2c1928e223c9a8e2fbd (diff) | |
| parent | d8c02bf06250015b8cb0bcc9c0d8445cfb6acf1c (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
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 cbc895390c..b4ed2adb07 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"); } |