diff options
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/Minimodule/World.cs | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/World.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/World.cs index 1ec4a33..da5ea0d 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/World.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/World.cs | |||
| @@ -37,15 +37,17 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
| 37 | public class World : System.MarshalByRefObject, IWorld, IWorldAudio | 37 | public class World : System.MarshalByRefObject, IWorld, IWorldAudio |
| 38 | { | 38 | { |
| 39 | private readonly Scene m_internalScene; | 39 | private readonly Scene m_internalScene; |
| 40 | private readonly ISecurityCredential m_security; | ||
| 40 | private readonly Heightmap m_heights; | 41 | private readonly Heightmap m_heights; |
| 41 | 42 | ||
| 42 | private readonly ObjectAccessor m_objs; | 43 | private readonly ObjectAccessor m_objs; |
| 43 | 44 | ||
| 44 | public World(Scene internalScene) | 45 | public World(Scene internalScene, ISecurityCredential securityCredential) |
| 45 | { | 46 | { |
| 47 | m_security = securityCredential; | ||
| 46 | m_internalScene = internalScene; | 48 | m_internalScene = internalScene; |
| 47 | m_heights = new Heightmap(m_internalScene); | 49 | m_heights = new Heightmap(m_internalScene); |
| 48 | m_objs = new ObjectAccessor(m_internalScene); | 50 | m_objs = new ObjectAccessor(m_internalScene, securityCredential); |
| 49 | } | 51 | } |
| 50 | 52 | ||
| 51 | #region Events | 53 | #region Events |
| @@ -84,7 +86,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
| 84 | if (_OnNewUser != null) | 86 | if (_OnNewUser != null) |
| 85 | { | 87 | { |
| 86 | NewUserEventArgs e = new NewUserEventArgs(); | 88 | NewUserEventArgs e = new NewUserEventArgs(); |
| 87 | e.Avatar = new SPAvatar(m_internalScene, presence.UUID); | 89 | e.Avatar = new SPAvatar(m_internalScene, presence.UUID, m_security); |
| 88 | _OnNewUser(this, e); | 90 | _OnNewUser(this, e); |
| 89 | } | 91 | } |
| 90 | } | 92 | } |
| @@ -144,7 +146,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
| 144 | if (chat.Sender == null && chat.SenderObject != null) | 146 | if (chat.Sender == null && chat.SenderObject != null) |
| 145 | { | 147 | { |
| 146 | ChatEventArgs e = new ChatEventArgs(); | 148 | ChatEventArgs e = new ChatEventArgs(); |
| 147 | e.Sender = new SOPObject(m_internalScene, ((SceneObjectPart) chat.SenderObject).LocalId); | 149 | e.Sender = new SOPObject(m_internalScene, ((SceneObjectPart) chat.SenderObject).LocalId, m_security); |
| 148 | e.Text = chat.Message; | 150 | e.Text = chat.Message; |
| 149 | 151 | ||
| 150 | _OnChat(this, e); | 152 | _OnChat(this, e); |
| @@ -154,7 +156,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
| 154 | if (chat.Sender != null && chat.SenderObject == null) | 156 | if (chat.Sender != null && chat.SenderObject == null) |
| 155 | { | 157 | { |
| 156 | ChatEventArgs e = new ChatEventArgs(); | 158 | ChatEventArgs e = new ChatEventArgs(); |
| 157 | e.Sender = new SPAvatar(m_internalScene, chat.SenderUUID); | 159 | e.Sender = new SPAvatar(m_internalScene, chat.SenderUUID, m_security); |
| 158 | e.Text = chat.Message; | 160 | e.Text = chat.Message; |
| 159 | 161 | ||
| 160 | _OnChat(this, e); | 162 | _OnChat(this, e); |
| @@ -207,7 +209,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
| 207 | for (int i = 0; i < ents.Count; i++) | 209 | for (int i = 0; i < ents.Count; i++) |
| 208 | { | 210 | { |
| 209 | EntityBase ent = ents[i]; | 211 | EntityBase ent = ents[i]; |
| 210 | rets[i] = new SPAvatar(m_internalScene, ent.UUID); | 212 | rets[i] = new SPAvatar(m_internalScene, ent.UUID, m_security); |
| 211 | } | 213 | } |
| 212 | 214 | ||
| 213 | return rets; | 215 | return rets; |