aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/chatbar_as_cmdline.cpp
diff options
context:
space:
mode:
authorthickbrick2010-09-21 18:23:43 +0200
committerthickbrick2010-09-21 18:23:43 +0200
commit070a8e6c351ac115c3063615a1a7c8a31ef33a48 (patch)
tree9e34845ac1c1028d446f30a61fcc6e0cf0095561 /linden/indra/newview/chatbar_as_cmdline.cpp
parentChanged version to Experimental 2010.09.18 (diff)
downloadmeta-impy-070a8e6c351ac115c3063615a1a7c8a31ef33a48.zip
meta-impy-070a8e6c351ac115c3063615a1a7c8a31ef33a48.tar.gz
meta-impy-070a8e6c351ac115c3063615a1a7c8a31ef33a48.tar.bz2
meta-impy-070a8e6c351ac115c3063615a1a7c8a31ef33a48.tar.xz
Double-click teleport:
- clean up duplicated (and subtly and needlessly different) code. - keep the camera heading in inter-sim double-click teleport in a hackish way, since SL sims give LookAt info that is kind of random in AgentMovementComplete.
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/chatbar_as_cmdline.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/chatbar_as_cmdline.cpp b/linden/indra/newview/chatbar_as_cmdline.cpp
index 59804c0..9359444 100644
--- a/linden/indra/newview/chatbar_as_cmdline.cpp
+++ b/linden/indra/newview/chatbar_as_cmdline.cpp
@@ -16,7 +16,7 @@
16 * may be used to endorse or promote products derived from this 16 * may be used to endorse or promote products derived from this
17 * software without specific prior written permission. 17 * software without specific prior written permission.
18 * 18 *
19 * THIS SOFTWARE IS PROVIDED BY MODULAR SYSTEMS AND CONTRIBUTORS AS IS 19 * THIS SOFTWARE IS PROVIDED BY MODULAR SYSTEMS AND CONTRIBUTORS "AS IS"
20 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 20 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
21 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 21 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL MODULAR SYSTEMS OR CONTRIBUTORS 22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL MODULAR SYSTEMS OR CONTRIBUTORS
@@ -331,7 +331,7 @@ bool cmd_line_chat(std::string revised_text, EChatType type)
331 } 331 }
332 else if(command == *sCmdLineChatbarTeleportToCam) 332 else if(command == *sCmdLineChatbarTeleportToCam)
333 { 333 {
334 gAgent.teleportViaLocation(gAgent.getCameraPositionGlobal()); 334 gAgent.teleportViaLocationLookAt(gAgent.getCameraPositionGlobal());
335 return false; 335 return false;
336 } 336 }
337 /*else if(command == *sCmdLineChatbarUndeform) 337 /*else if(command == *sCmdLineChatbarUndeform)