1 files changed, 30 insertions, 21 deletions

diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 2940bdd..51953b09 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -2106,32 +2106,41 @@ class LLObjectMute : public view_listener_t
 
 bool handle_go_to()
 {
-        // JAMESDEBUG try simulator autopilot
-        std::vector<std::string> strings;
-        std::string val;
         LLVector3d pos = LLToolPie::getInstance()->getPick().mPosGlobal;
-        val = llformat("%g", pos.mdV[VX]);
-        strings.push_back(val);
-        val = llformat("%g", pos.mdV[VY]);
-        strings.push_back(val);
-        val = llformat("%g", pos.mdV[VZ]);
-        strings.push_back(val);
-        send_generic_message("autopilot", strings);
-
-        LLViewerParcelMgr::getInstance()->deselectLand();
-
-        if (gAgent.getAvatarObject() && !gSavedSettings.getBOOL("AutoPilotLocksCamera"))
+        if (gSavedSettings.getBOOL("DoubleClickTeleport"))
         {
-                gAgent.setFocusGlobal(gAgent.getFocusTargetGlobal(), gAgent.getAvatarObject()->getID());
+                LLVector3d hips_offset(0.0f, 0.0f, 1.2f);
+                gAgent.setControlFlags(AGENT_CONTROL_STAND_UP);
+                gAgent.teleportViaLocation(pos + hips_offset);
         }
-        else 
+        else
         {
-                // Snap camera back to behind avatar
-                gAgent.setFocusOnAvatar(TRUE, ANIMATE);
-        }
+                // JAMESDEBUG try simulator autopilot
+                std::vector<std::string> strings;
+                std::string val;
+                val = llformat("%g", pos.mdV[VX]);
+                strings.push_back(val);
+                val = llformat("%g", pos.mdV[VY]);
+                strings.push_back(val);
+                val = llformat("%g", pos.mdV[VZ]);
+                strings.push_back(val);
+                send_generic_message("autopilot", strings);
+
+                LLViewerParcelMgr::getInstance()->deselectLand();
 
-        // Could be first use
-        LLFirstUse::useGoTo();
+                if (gAgent.getAvatarObject() && !gSavedSettings.getBOOL("AutoPilotLocksCamera"))
+                {
+                        gAgent.setFocusGlobal(gAgent.getFocusTargetGlobal(), gAgent.getAvatarObject()->getID());
+                }
+                else 
+                {
+                        // Snap camera back to behind avatar
+                        gAgent.setFocusOnAvatar(TRUE, ANIMATE);
+                }
+
+                // Could be first use
+                LLFirstUse::useGoTo();
+        }
         return true;
 }