aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMcCabe Maxsted2010-05-17 19:02:05 -0700
committerJacek Antonelli2010-06-19 02:40:53 -0500
commit36f37f317841ee0083d71ed0e2ef545d1ecd1b62 (patch)
tree9aeaf105c492289a24984ed2ac2c268e1093c616
parentChanged max texture repeats to 10000 in floater_tools.xml (diff)
downloadmeta-impy-36f37f317841ee0083d71ed0e2ef545d1ecd1b62.zip
meta-impy-36f37f317841ee0083d71ed0e2ef545d1ecd1b62.tar.gz
meta-impy-36f37f317841ee0083d71ed0e2ef545d1ecd1b62.tar.bz2
meta-impy-36f37f317841ee0083d71ed0e2ef545d1ecd1b62.tar.xz
Fixed Autopilot > Move feature
-rw-r--r--linden/indra/newview/llviewermenu.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index a71240d..b4b5532 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -2450,7 +2450,7 @@ bool handle_go_to_confirm()
2450 { 2450 {
2451 LLNotifications::instance().add("ConfirmDoubleClickTP", LLSD(), LLSD(), &handle_go_to_callback); 2451 LLNotifications::instance().add("ConfirmDoubleClickTP", LLSD(), LLSD(), &handle_go_to_callback);
2452 } 2452 }
2453 else if (action == "autopilot") 2453 else if (action == "move")
2454 { 2454 {
2455 LLNotifications::instance().add("ConfirmAutoPilot", LLSD(), LLSD(), &handle_go_to_callback); 2455 LLNotifications::instance().add("ConfirmAutoPilot", LLSD(), LLSD(), &handle_go_to_callback);
2456 } 2456 }
@@ -2493,7 +2493,7 @@ bool handle_go_to_callback(const LLSD& notification, const LLSD& response)
2493 gAgent.setControlFlags(AGENT_CONTROL_STAND_UP); 2493 gAgent.setControlFlags(AGENT_CONTROL_STAND_UP);
2494 gAgent.teleportViaLocation(pos + hips_offset); 2494 gAgent.teleportViaLocation(pos + hips_offset);
2495 } 2495 }
2496 else if (action == "autopilot") 2496 else if (action == "move")
2497 { 2497 {
2498 // JAMESDEBUG try simulator autopilot 2498 // JAMESDEBUG try simulator autopilot
2499 std::vector<std::string> strings; 2499 std::vector<std::string> strings;