aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs19
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs19
2 files changed, 22 insertions, 16 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index 6eb8749..a03d8a6 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -6869,19 +6869,22 @@ namespace OpenSim.Region.ScriptEngine.Common
6869 param.Add(o.ToString()); 6869 param.Add(o.ToString());
6870 } 6870 }
6871 6871
6872 LLVector3 position = m_host.AbsolutePosition;
6873 LLVector3 velocity = m_host.Velocity;
6874 LLQuaternion rotation = m_host.RotationOffset;
6875 ScenePresence scenePresence = World.GetScenePresence(m_host.ObjectOwner);
6876 RegionInfo regionInfo = World.RegionInfo;
6877
6872 Dictionary<string, string> httpHeaders = new Dictionary<string, string>(); 6878 Dictionary<string, string> httpHeaders = new Dictionary<string, string>();
6873 6879
6874 httpHeaders["X-SecondLife-Shard"] = "OpenSim"; 6880 httpHeaders["X-SecondLife-Shard"] = "OpenSim";
6875 httpHeaders["X-SecondLife-Object-Name"] = m_host.Name; 6881 httpHeaders["X-SecondLife-Object-Name"] = m_host.Name;
6876 httpHeaders["X-SecondLife-Object-Key"] = m_itemID.ToString(); 6882 httpHeaders["X-SecondLife-Object-Key"] = m_itemID.ToString();
6877 httpHeaders["X-SecondLife-Region"] = World.RegionInfo.RegionName; 6883 httpHeaders["X-SecondLife-Region"] = string.Format("{0} ({1}, {2})", regionInfo.RegionName, regionInfo.RegionLocX, regionInfo.RegionLocY);
6878 httpHeaders["X-SecondLife-Local-Position"] = m_host.AbsolutePosition.ToString(); 6884 httpHeaders["X-SecondLife-Local-Position"] = string.Format("({0:0.000000}, {1:0.000000}, {2:0.000000})", position.X, position.Y, position.Z);
6879 httpHeaders["X-SecondLife-Local-Velocity"] = m_host.Velocity.ToString(); 6885 httpHeaders["X-SecondLife-Local-Velocity"] = string.Format("({0:0.000000}, {1:0.000000}, {2:0.000000})", velocity.X, velocity.Y, velocity.Z);
6880 httpHeaders["X-SecondLife-Local-Rotation"] = m_host.RotationOffset.ToString(); 6886 httpHeaders["X-SecondLife-Local-Rotation"] = string.Format("({0:0.000000}, {1:0.000000}, {2:0.000000}, {3:0.000000})", rotation.X, rotation.Y, rotation.Z, rotation.W);
6881 6887 httpHeaders["X-SecondLife-Owner-Name"] = scenePresence == null ? string.Empty : scenePresence.ControllingClient.Name;
6882 ScenePresence scenePresence = World.GetScenePresence(m_host.ObjectOwner);
6883 httpHeaders["X-SecondLife-Owner-Name"] = scenePresence == null ? string.Empty : scenePresence.Name;
6884
6885 httpHeaders["X-SecondLife-Owner-Key"] = m_host.ObjectOwner.ToString(); 6888 httpHeaders["X-SecondLife-Owner-Key"] = m_host.ObjectOwner.ToString();
6886 6889
6887 LLUUID reqID = httpScriptMod. 6890 LLUUID reqID = httpScriptMod.
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 507a132..bb292f1 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -6649,19 +6649,22 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6649 param.Add(o.ToString()); 6649 param.Add(o.ToString());
6650 } 6650 }
6651 6651
6652 LLVector3 position = m_host.AbsolutePosition;
6653 LLVector3 velocity = m_host.Velocity;
6654 LLQuaternion rotation = m_host.RotationOffset;
6655 ScenePresence scenePresence = World.GetScenePresence(m_host.ObjectOwner);
6656 RegionInfo regionInfo = World.RegionInfo;
6657
6652 Dictionary<string, string> httpHeaders = new Dictionary<string, string>(); 6658 Dictionary<string, string> httpHeaders = new Dictionary<string, string>();
6653 6659
6654 httpHeaders["X-SecondLife-Shard"] = "OpenSim"; 6660 httpHeaders["X-SecondLife-Shard"] = "OpenSim";
6655 httpHeaders["X-SecondLife-Object-Name"] = m_host.Name; 6661 httpHeaders["X-SecondLife-Object-Name"] = m_host.Name;
6656 httpHeaders["X-SecondLife-Object-Key"] = m_itemID.ToString(); 6662 httpHeaders["X-SecondLife-Object-Key"] = m_itemID.ToString();
6657 httpHeaders["X-SecondLife-Region"] = World.RegionInfo.RegionName; 6663 httpHeaders["X-SecondLife-Region"] = string.Format("{0} ({1}, {2})", regionInfo.RegionName, regionInfo.RegionLocX, regionInfo.RegionLocY);
6658 httpHeaders["X-SecondLife-Local-Position"] = m_host.AbsolutePosition.ToString(); 6664 httpHeaders["X-SecondLife-Local-Position"] = string.Format("({0:0.000000}, {1:0.000000}, {2:0.000000})", position.X, position.Y, position.Z);
6659 httpHeaders["X-SecondLife-Local-Velocity"] = m_host.Velocity.ToString(); 6665 httpHeaders["X-SecondLife-Local-Velocity"] = string.Format("({0:0.000000}, {1:0.000000}, {2:0.000000})", velocity.X, velocity.Y, velocity.Z);
6660 httpHeaders["X-SecondLife-Local-Rotation"] = m_host.RotationOffset.ToString(); 6666 httpHeaders["X-SecondLife-Local-Rotation"] = string.Format("({0:0.000000}, {1:0.000000}, {2:0.000000}, {3:0.000000})", rotation.X, rotation.Y, rotation.Z, rotation.W);
6661 6667 httpHeaders["X-SecondLife-Owner-Name"] = scenePresence == null ? string.Empty : scenePresence.ControllingClient.Name;
6662 ScenePresence scenePresence = World.GetScenePresence(m_host.ObjectOwner);
6663 httpHeaders["X-SecondLife-Owner-Name"] = scenePresence == null ? string.Empty : scenePresence.Name;
6664
6665 httpHeaders["X-SecondLife-Owner-Key"] = m_host.ObjectOwner.ToString(); 6668 httpHeaders["X-SecondLife-Owner-Key"] = m_host.ObjectOwner.ToString();
6666 6669
6667 LLUUID reqID = httpScriptMod. 6670 LLUUID reqID = httpScriptMod.