diff options
| author | Richard Linden <none@none> | 2013-08-26 18:17:26 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-08-26 18:17:26 -0700 |
| commit | 1f3f660cf4de95fa7e6cbe4015630640aecd22dd (patch) | |
| tree | 1b64dea44cca08731b0c33b15b90e929c83831d0 /indra/newview/llviewermessage.cpp | |
| parent | cb8c94cc888c432a22af98f9d28d448d66a77a52 (diff) | |
| parent | 8535b87544cc2e71896716a4cd1c3c2445ff4af0 (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rwxr-xr-x | indra/newview/llviewermessage.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index b4ed2adb07..7de8e1ff12 100755 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -7219,10 +7219,10 @@ void process_script_teleport_request(LLMessageSystem* msg, void**) LLFloaterWorldMap* instance = LLFloaterWorldMap::getInstance(); if(instance) { - llinfos << "Object named " << object_name + LL_INFOS() << "Object named " << object_name << " is offering TP to region " << sim_name << " position " << pos - << llendl; + << LL_ENDL; instance->trackURL(sim_name, (S32)pos.mV[VX], (S32)pos.mV[VY], (S32)pos.mV[VZ]); LLFloaterReg::showInstance("world_map", "center"); |