diff options
Another small tweak to image sending.
Implemented a few ll Functions, llSetObjectName llGetObjectName, llLoadURL (all currently untested).
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 9 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs | 1 |
3 files changed, 11 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index dcc3e16..49ba655 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -1099,6 +1099,14 @@ namespace OpenSim.Region.Environment.Scenes | |||
1099 | 1099 | ||
1100 | #endregion | 1100 | #endregion |
1101 | 1101 | ||
1102 | public void SendUrlToUser(LLUUID avatarID, string objectname, LLUUID objectID, LLUUID ownerID, bool groupOwned, string message, string url) | ||
1103 | { | ||
1104 | if (Avatars.ContainsKey(avatarID)) | ||
1105 | { | ||
1106 | Avatars[avatarID].ControllingClient.SendLoadURL(objectname, objectID, ownerID, groupOwned, message, url); | ||
1107 | } | ||
1108 | } | ||
1109 | |||
1102 | #region Alert Methods | 1110 | #region Alert Methods |
1103 | 1111 | ||
1104 | void SendPermissionAlert(LLUUID user, string reason) | 1112 | void SendPermissionAlert(LLUUID user, string reason) |
@@ -1106,6 +1114,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1106 | SendAlertToUser(user, reason, false); | 1114 | SendAlertToUser(user, reason, false); |
1107 | } | 1115 | } |
1108 | 1116 | ||
1117 | |||
1109 | public void SendGeneralAlert(string message) | 1118 | public void SendGeneralAlert(string message) |
1110 | { | 1119 | { |
1111 | foreach (ScenePresence presence in this.Avatars.Values) | 1120 | foreach (ScenePresence presence in this.Avatars.Values) |
diff --git a/OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs b/OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs index 5d5f698..d2ca529 100644 --- a/OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs +++ b/OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs | |||
@@ -7,7 +7,7 @@ namespace OpenSim.Region.Environment.Scenes.Scripting | |||
7 | { | 7 | { |
8 | public interface IScriptHost | 8 | public interface IScriptHost |
9 | { | 9 | { |
10 | string Name { get; } | 10 | string Name { get; set;} |
11 | LLUUID UUID { get; } | 11 | LLUUID UUID { get; } |
12 | LLVector3 AbsolutePosition { get; } | 12 | LLVector3 AbsolutePosition { get; } |
13 | void SetText(string text, Axiom.Math.Vector3 color, double alpha); | 13 | void SetText(string text, Axiom.Math.Vector3 color, double alpha); |
diff --git a/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs b/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs index 62c84a6..a9147fb1 100644 --- a/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs +++ b/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs | |||
@@ -12,6 +12,7 @@ namespace OpenSim.Region.Environment.Scenes.Scripting | |||
12 | public string Name | 12 | public string Name |
13 | { | 13 | { |
14 | get { return "Object"; } | 14 | get { return "Object"; } |
15 | set { } | ||
15 | } | 16 | } |
16 | 17 | ||
17 | public LLUUID UUID | 18 | public LLUUID UUID |