2 files changed, 28 insertions, 0 deletions
diff --git a/indra/newview/llagentlistener.cpp b/indra/newview/llagentlistener.cpp
index c453fe91f4..ef39fed587 100644
--- a/indra/newview/llagentlistener.cpp
+++ b/indra/newview/llagentlistener.cpp
@@ -59,11 +59,20 @@ LLAgentListener::LLAgentListener(LLAgent &agent)
         "Set the agent to a fixed orientation (optionally specify [\"lookat\"] = array of [x, y, z])",
         &LLAgentListener::resetAxes);
     add("getAxes",
+        "Obsolete - use getPosition instead\n"
         "Send information about the agent's orientation on [\"reply\"]:\n"
         "[\"euler\"]: map of {roll, pitch, yaw}\n"
         "[\"quat\"]:  array of [x, y, z, w] quaternion values",
         &LLAgentListener::getAxes,
         LLSDMap("reply", LLSD()));
+    add("getPosition",
+        "Send information about the agent's position and orientation on [\"reply\"]:\n"
+        "[\"region\"]: array of region {x, y, z} position\n"
+        "[\"global\"]: array of global {x, y, z} position\n"
+        "[\"euler\"]: map of {roll, pitch, yaw}\n"
+        "[\"quat\"]:  array of [x, y, z, w] quaternion values",
+        &LLAgentListener::getPosition,
+        LLSDMap("reply", LLSD()));
 }
 
 void LLAgentListener::requestTeleport(LLSD const & event_data) const
@@ -140,3 +149,21 @@ void LLAgentListener::getAxes(const LLSD& event) const
               ("euler", LLSDMap("roll", roll)("pitch", pitch)("yaw", yaw)),
               event);
 }
+
+
+void LLAgentListener::getPosition(const LLSD& event) const
+{
+	LLVector3 region_pos(mAgent.getPositionAgent());
+	LLVector3 global_pos(mAgent.getPositionGlobal());
+    LLQuaternion quat(mAgent.getQuat());
+    F32 roll, pitch, yaw;
+    quat.getEulerAngles(&roll, &pitch, &yaw);
+    // The official query API for LLQuaternion's [x, y, z, w] values is its
+    // public member mQ...
+    sendReply(LLSDMap
+              ("region", llsd_copy_array(boost::begin(region_pos.mV), boost::end(region_pos.mV)))
+              ("global", llsd_copy_array(boost::begin(global_pos.mV), boost::end(global_pos.mV)))
+              ("quat", llsd_copy_array(boost::begin(quat.mQ), boost::end(quat.mQ)))
+              ("euler", LLSDMap("roll", roll)("pitch", pitch)("yaw", yaw)),
+              event);
+}
diff --git a/indra/newview/llagentlistener.h b/indra/newview/llagentlistener.h
index 0aa58d0b16..6f087fc3da 100644
--- a/indra/newview/llagentlistener.h
+++ b/indra/newview/llagentlistener.h
@@ -46,6 +46,7 @@ private:
 	void requestStand(LLSD const & event_data) const;
 	void resetAxes(const LLSD& event) const;
 	void getAxes(const LLSD& event) const;
+	void getPosition(const LLSD& event) const;
 
 private:
 	LLAgent & mAgent;