Added "DoubleClickAction" and "GoAction" settings.

Together they replace "DoubleClickAutopilot" and
"DoubleClickTeleport".

3 files changed, 41 insertions, 43 deletions

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index e1a6f1f..95dd186 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -2399,27 +2399,16 @@
       <key>Value</key>
       <real>1.0</real>
     </map>
-    <key>DoubleClickAutoPilot</key>
+    <key>DoubleClickAction</key>
     <map>
       <key>Comment</key>
-      <string>Enable double-click auto pilot</string>
+      <string>What to do when you double-click. Either "None" or "Go".</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
-    <key>DoubleClickTeleport</key>
-    <map>
-      <key>Comment</key>
-      <string>Enable double-click teleport</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
+      <string>String</string>
       <key>Value</key>
-      <integer>1</integer>
+      <string>None</string>
     </map>
     <key>DragAndDropToolTipDelay</key>
     <map>
@@ -3913,6 +3902,17 @@
       <key>Value</key>
       <integer>1024</integer>
     </map>
+    <key>GoAction</key>
+    <map>
+      <key>Comment</key>
+      <string>How to move for "Go Here" or double-click move. Either "Autopilot" or "Teleport".</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>String</string>
+      <key>Value</key>
+      <string>Autopilot</string>
+    </map>
     <key>GridCrossSections</key>
     <map>
       <key>Comment</key>
diff --git a/linden/indra/newview/lltoolpie.cpp b/linden/indra/newview/lltoolpie.cpp
index cda76d9..8b57011 100644
--- a/linden/indra/newview/lltoolpie.cpp
+++ b/linden/indra/newview/lltoolpie.cpp
@@ -676,7 +676,14 @@ BOOL LLToolPie::handleDoubleClick(S32 x, S32 y, MASK mask)
                 llinfos << "LLToolPie handleDoubleClick (becoming mouseDown)" << llendl;
         }
 
-        if (gSavedSettings.getBOOL("DoubleClickAutoPilot") || gSavedSettings.getBOOL("DoubleClickTeleport"))
+        std::string action = gSavedSettings.getString("DoubleClickAction");
+        LLStringUtil::toLower(action);
+
+        if (action == "none")
+        {
+                return FALSE;
+        }
+        else if (action == "go")
         {
                 if (mPick.mPickType == LLPickInfo::PICK_LAND
                         && !mPick.mPosGlobal.isExactlyZero())
@@ -695,32 +702,12 @@ BOOL LLToolPie::handleDoubleClick(S32 x, S32 y, MASK mask)
                         return TRUE;
                 }
         }
-
-        return FALSE;
-
-        /* JC - don't do go-there, because then double-clicking on physical
-        objects gets you into trouble.
-
-        // If double-click on object or land, go there.
-        LLViewerObject *object = gViewerWindow->getLastPick().getObject();
-        if (object)
-        {
-                if (object->isAvatar())
-                {
-                        LLFloaterAvatarInfo::showFromAvatar(object->getID());
-                }
-                else
-                {
-                        handle_go_to(NULL);
-                }
-        }
-        else if (!gLastHitPosGlobal.isExactlyZero())
+        else
         {
-                handle_go_to(NULL);
+                llwarns << "Unhandled DoubleClickAction setting: " << action << llendl;
         }
 
-        return TRUE;
-        */
+        return FALSE;
 }
 
 
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index bd8b6ab..4732046 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -2393,11 +2393,14 @@ bool handle_go_to_confirm()
         }
 // [/RLVa:KB]
 
-        if (gSavedSettings.getBOOL("DoubleClickTeleport"))
+        std::string action = gSavedSettings.getString("GoAction");
+        LLStringUtil::toLower(action);
+
+        if (action == "teleport")
         {
                 gViewerWindow->alertXml("ConfirmDoubleClickTP", handle_go_to_callback, (void*)LLToolPie::getInstance());
         }
-        else if (gSavedSettings.getBOOL("DoubleClickAutoPilot"))
+        else if (action == "autopilot")
         {
                 gViewerWindow->alertXml("ConfirmAutoPilot", handle_go_to_callback, (void*)LLToolPie::getInstance());
         }
@@ -2431,13 +2434,17 @@ void handle_go_to_callback(S32 option, void *userdata)
                 std::vector<std::string> strings;
                 std::string val;
                 LLVector3d pos = pie->getPick().mPosGlobal;
-                if (gSavedSettings.getBOOL("DoubleClickTeleport"))
+
+                std::string action = gSavedSettings.getString("GoAction");
+                LLStringUtil::toLower(action);
+
+                if (action == "teleport")
                 {
                         LLVector3d hips_offset(0.0f, 0.0f, 1.2f);
                         gAgent.setControlFlags(AGENT_CONTROL_STAND_UP);
                         gAgent.teleportViaLocation(pos + hips_offset);
                 }
-                else
+                else if (action == "autopilot")
                 {
                         // JAMESDEBUG try simulator autopilot
                         std::vector<std::string> strings;
@@ -2465,6 +2472,10 @@ void handle_go_to_callback(S32 option, void *userdata)
                         // Could be first use
                         LLFirstUse::useGoTo();
                 }
+                else
+                {
+                        llwarns << "Unhandled GoAction setting: " << action << llendl;
+                }
         }
 }