2 files changed, 34 insertions, 2 deletions

diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index 4106fbb..6eb8749 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -6868,8 +6868,24 @@ namespace OpenSim.Region.ScriptEngine.Common
             {
                 param.Add(o.ToString());
             }
+
+            Dictionary<string, string> httpHeaders = new Dictionary<string, string>();
+
+            httpHeaders["X-SecondLife-Shard"] = "OpenSim";
+            httpHeaders["X-SecondLife-Object-Name"] = m_host.Name;
+            httpHeaders["X-SecondLife-Object-Key"] = m_itemID.ToString();
+            httpHeaders["X-SecondLife-Region"] = World.RegionInfo.RegionName;
+            httpHeaders["X-SecondLife-Local-Position"] = m_host.AbsolutePosition.ToString();
+            httpHeaders["X-SecondLife-Local-Velocity"] = m_host.Velocity.ToString();
+            httpHeaders["X-SecondLife-Local-Rotation"] = m_host.RotationOffset.ToString();
+
+            ScenePresence scenePresence = World.GetScenePresence(m_host.ObjectOwner);
+            httpHeaders["X-SecondLife-Owner-Name"] = scenePresence == null ? string.Empty : scenePresence.Name;
+
+            httpHeaders["X-SecondLife-Owner-Key"] = m_host.ObjectOwner.ToString();
+
             LLUUID reqID = httpScriptMod.
-                StartHttpRequest(m_localID, m_itemID, url, param, body);
+                StartHttpRequest(m_localID, m_itemID, url, param, httpHeaders, body);
 
             if (reqID != LLUUID.Zero)
                 return reqID.ToString();
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 06a6086..507a132 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -6648,8 +6648,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             {
                 param.Add(o.ToString());
             }
+
+            Dictionary<string, string> httpHeaders = new Dictionary<string, string>();
+
+            httpHeaders["X-SecondLife-Shard"] = "OpenSim";
+            httpHeaders["X-SecondLife-Object-Name"] = m_host.Name;
+            httpHeaders["X-SecondLife-Object-Key"] = m_itemID.ToString();
+            httpHeaders["X-SecondLife-Region"] = World.RegionInfo.RegionName;
+            httpHeaders["X-SecondLife-Local-Position"] = m_host.AbsolutePosition.ToString();
+            httpHeaders["X-SecondLife-Local-Velocity"] = m_host.Velocity.ToString();
+            httpHeaders["X-SecondLife-Local-Rotation"] = m_host.RotationOffset.ToString();
+
+            ScenePresence scenePresence = World.GetScenePresence(m_host.ObjectOwner);
+            httpHeaders["X-SecondLife-Owner-Name"] = scenePresence == null ? string.Empty : scenePresence.Name;
+
+            httpHeaders["X-SecondLife-Owner-Key"] = m_host.ObjectOwner.ToString();
+
             LLUUID reqID = httpScriptMod.
-                StartHttpRequest(m_localID, m_itemID, url, param, body);
+                StartHttpRequest(m_localID, m_itemID, url, param, httpHeaders, body);
 
             if (reqID != LLUUID.Zero)
                 return reqID.ToString();