diff options
Diffstat (limited to '')
5 files changed, 12 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/EntityBase.cs b/OpenSim/Region/Environment/Scenes/EntityBase.cs index 6d933e6..a7b9d75 100644 --- a/OpenSim/Region/Environment/Scenes/EntityBase.cs +++ b/OpenSim/Region/Environment/Scenes/EntityBase.cs | |||
@@ -5,7 +5,7 @@ using OpenSim.Region.Environment.Scenes.Scripting; | |||
5 | 5 | ||
6 | namespace OpenSim.Region.Environment.Scenes | 6 | namespace OpenSim.Region.Environment.Scenes |
7 | { | 7 | { |
8 | public abstract class EntityBase : IScriptHost | 8 | public abstract class EntityBase |
9 | { | 9 | { |
10 | protected List<EntityBase> m_children; | 10 | protected List<EntityBase> m_children; |
11 | 11 | ||
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index b77da3a..a621632 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |||
@@ -201,6 +201,11 @@ namespace OpenSim.Region.Environment.Scenes | |||
201 | } | 201 | } |
202 | #endregion | 202 | #endregion |
203 | 203 | ||
204 | public LLUUID ObjectOwner | ||
205 | { | ||
206 | get { return OwnerID; } | ||
207 | } | ||
208 | |||
204 | #region Constructors | 209 | #region Constructors |
205 | /// <summary> | 210 | /// <summary> |
206 | /// | 211 | /// |
diff --git a/OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs b/OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs index d2ca529..e7d0570 100644 --- a/OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs +++ b/OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs | |||
@@ -9,6 +9,7 @@ namespace OpenSim.Region.Environment.Scenes.Scripting | |||
9 | { | 9 | { |
10 | string Name { get; set;} | 10 | string Name { get; set;} |
11 | LLUUID UUID { get; } | 11 | LLUUID UUID { get; } |
12 | LLUUID ObjectOwner { get;} | ||
12 | LLVector3 AbsolutePosition { get; } | 13 | LLVector3 AbsolutePosition { get; } |
13 | void SetText(string text, Axiom.Math.Vector3 color, double alpha); | 14 | void SetText(string text, Axiom.Math.Vector3 color, double alpha); |
14 | } | 15 | } |
diff --git a/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs b/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs index a9147fb1..a50b142 100644 --- a/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs +++ b/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs | |||
@@ -20,6 +20,9 @@ namespace OpenSim.Region.Environment.Scenes.Scripting | |||
20 | get { return LLUUID.Zero; } | 20 | get { return LLUUID.Zero; } |
21 | } | 21 | } |
22 | 22 | ||
23 | public LLUUID ObjectOwner | ||
24 | { get { return LLUUID.Zero; } } | ||
25 | |||
23 | public LLVector3 AbsolutePosition | 26 | public LLVector3 AbsolutePosition |
24 | { | 27 | { |
25 | get { return m_pos; } | 28 | get { return m_pos; } |
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs index 92024b6..493a063 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs | |||
@@ -293,7 +293,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler | |||
293 | public void llDetachFromAvatar() { } | 293 | public void llDetachFromAvatar() { } |
294 | public void llTakeCamera() { } | 294 | public void llTakeCamera() { } |
295 | public void llReleaseCamera() { } | 295 | public void llReleaseCamera() { } |
296 | public string llGetOwner() { return ""; } | 296 | public string llGetOwner() { return m_host.ObjectOwner.ToStringHyphenated(); } |
297 | public void llInstantMessage(string user, string message) { } | 297 | public void llInstantMessage(string user, string message) { } |
298 | public void llEmail(string address, string subject, string message) { } | 298 | public void llEmail(string address, string subject, string message) { } |
299 | public void llGetNextEmail(string address, string subject) { } | 299 | public void llGetNextEmail(string address, string subject) { } |
@@ -587,7 +587,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler | |||
587 | public void llLoadURL(string avatar_id, string message, string url) | 587 | public void llLoadURL(string avatar_id, string message, string url) |
588 | { | 588 | { |
589 | LLUUID avatarId = new LLUUID(avatar_id); | 589 | LLUUID avatarId = new LLUUID(avatar_id); |
590 | m_ScriptEngine.World.SendUrlToUser(avatarId, m_host.Name, m_host.UUID, LLUUID.Zero, false, message, url); | 590 | m_ScriptEngine.World.SendUrlToUser(avatarId, m_host.Name, m_host.UUID, m_host.ObjectOwner, false, message, url); |
591 | } | 591 | } |
592 | public void llParcelMediaCommandList(List<string> commandList) { } | 592 | public void llParcelMediaCommandList(List<string> commandList) { } |
593 | public void llParcelMediaQuery() { } | 593 | public void llParcelMediaQuery() { } |