Added 'Teleport to Ground' option in the Advanced menu

2 files changed, 22 insertions, 0 deletions

diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index c5ce236..13d7209 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -8754,6 +8754,24 @@ class LLAdvancedCheckSit : public view_listener_t
         }
 };
 
+//////////////////
+// TP TO GROUND //
+//////////////////
+
+class LLAdvancedTPToGround: public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLVector3 agentPos = gAgent.getPositionAgent();
+        U64 agentRegion = gAgent.getRegion()->getHandle();
+        LLVector3 targetPos(agentPos.mV[0],agentPos.mV[1],LLWorld::getInstance()->resolveLandHeightAgent(agentPos));
+        LLVector3d pos_global = from_region_handle(agentRegion);
+        pos_global += LLVector3d((F64)targetPos.mV[0],(F64)targetPos.mV[1],(F64)targetPos.mV[2]);
+        gAgent.teleportViaLocation(pos_global);
+                return true;
+        }
+};
+
 
 /////////////
 // PHANTOM //
@@ -11198,6 +11216,7 @@ void initialize_menus()
         addMenu(new LLAdvancedReloadSettingsOverrides(), "Advanced.ReloadSettingsOverrides");
         addMenu(new LLAdvancedToggleSit(), "Advanced.ToggleSit");
         addMenu(new LLAdvancedCheckSit(), "Advanced.CheckSit");
+        addMenu(new LLAdvancedTPToGround(), "Advanced.TPToGround");
         addMenu(new LLAdvancedTogglePhantom(), "Advanced.TogglePhantom");
         addMenu(new LLAdvancedCheckPhantom(), "Advanced.CheckPhantom");
         addMenu(new LLAdvancedToggleAssetBrowser(),"Advanced.ToggleAssetBrowser");
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 836c4dd..e69f3f9 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -969,6 +969,9 @@
       <on_click function="Advanced.ToggleSit" userdata="" />
       <on_Check function="Advanced.CheckSit" userdata="" />
     </menu_item_call>
+    <menu_item_call name="Teleport to Ground" label="Teleport to Ground">
+      <on_click function="Advanced.TPToGround" userdata="" />
+    </menu_item_call>
     <menu_item_check label="Phantom Avatar" name="Phantom" 
                      shortcut="control|alt|p">
       <on_click function="Advanced.TogglePhantom" userdata="" />