diff options
author | dahlia | 2010-10-26 21:20:18 -0700 |
---|---|---|
committer | dahlia | 2010-10-26 21:20:18 -0700 |
commit | a4e95c0717cf5bf8e1b7a33b2d95d58e0bacf389 (patch) | |
tree | 8e10af353afa5c301a250b2e3017234cee02cbe7 /OpenSim/Region/OptionalModules | |
parent | Overload Scene.NewUserConnection() to facilitate NPCs and other region specif... (diff) | |
parent | Formatting cleanup. (diff) | |
download | opensim-SC-a4e95c0717cf5bf8e1b7a33b2d95d58e0bacf389.zip opensim-SC-a4e95c0717cf5bf8e1b7a33b2d95d58e0bacf389.tar.gz opensim-SC-a4e95c0717cf5bf8e1b7a33b2d95d58e0bacf389.tar.bz2 opensim-SC-a4e95c0717cf5bf8e1b7a33b2d95d58e0bacf389.tar.xz |
Merge branch 'master' of ssh://MyConnection01/var/git/opensim
Diffstat (limited to 'OpenSim/Region/OptionalModules')
-rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs | 11 |
2 files changed, 6 insertions, 9 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs index 25dba7f..3d34441 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs | |||
@@ -220,7 +220,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
220 | groupID, groupMembers.Count); | 220 | groupID, groupMembers.Count); |
221 | 221 | ||
222 | foreach (GroupMembersData member in groupMembers) | 222 | foreach (GroupMembersData member in groupMembers) |
223 | { | 223 | { |
224 | if (m_groupData.hasAgentDroppedGroupChatSession(member.AgentID, groupID)) | 224 | if (m_groupData.hasAgentDroppedGroupChatSession(member.AgentID, groupID)) |
225 | { | 225 | { |
226 | // Don't deliver messages to people who have dropped this session | 226 | // Don't deliver messages to people who have dropped this session |
@@ -266,7 +266,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
266 | 266 | ||
267 | void OnClientLogin(IClientAPI client) | 267 | void OnClientLogin(IClientAPI client) |
268 | { | 268 | { |
269 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING]: OnInstantMessage registered for {0}", client.Name); | 269 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING]: OnInstantMessage registered for {0}", client.Name); |
270 | } | 270 | } |
271 | 271 | ||
272 | private void OnNewClient(IClientAPI client) | 272 | private void OnNewClient(IClientAPI client) |
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs index 2ddc31b..f47e71c 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs | |||
@@ -50,7 +50,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
50 | { | 50 | { |
51 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 51 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
52 | private Scene m_scene; | 52 | private Scene m_scene; |
53 | 53 | ||
54 | private readonly Dictionary<UUID,MRMBase> m_scripts = new Dictionary<UUID, MRMBase>(); | 54 | private readonly Dictionary<UUID,MRMBase> m_scripts = new Dictionary<UUID, MRMBase>(); |
55 | 55 | ||
56 | private readonly Dictionary<Type,object> m_extensions = new Dictionary<Type, object>(); | 56 | private readonly Dictionary<Type,object> m_extensions = new Dictionary<Type, object>(); |
@@ -77,7 +77,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
77 | { | 77 | { |
78 | m_log.Info("[MRM] Enabling MRM Module"); | 78 | m_log.Info("[MRM] Enabling MRM Module"); |
79 | m_scene = scene; | 79 | m_scene = scene; |
80 | 80 | ||
81 | // when hidden, we don't listen for client initiated script events | 81 | // when hidden, we don't listen for client initiated script events |
82 | // only making the MRM engine available for region modules | 82 | // only making the MRM engine available for region modules |
83 | if (!source.Configs["MRM"].GetBoolean("Hidden", false)) | 83 | if (!source.Configs["MRM"].GetBoolean("Hidden", false)) |
@@ -85,7 +85,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
85 | scene.EventManager.OnRezScript += EventManager_OnRezScript; | 85 | scene.EventManager.OnRezScript += EventManager_OnRezScript; |
86 | scene.EventManager.OnStopScript += EventManager_OnStopScript; | 86 | scene.EventManager.OnStopScript += EventManager_OnStopScript; |
87 | } | 87 | } |
88 | 88 | ||
89 | scene.EventManager.OnFrame += EventManager_OnFrame; | 89 | scene.EventManager.OnFrame += EventManager_OnFrame; |
90 | 90 | ||
91 | scene.RegisterModuleInterface<IMRMModule>(this); | 91 | scene.RegisterModuleInterface<IMRMModule>(this); |
@@ -304,7 +304,6 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
304 | 304 | ||
305 | public void PostInitialise() | 305 | public void PostInitialise() |
306 | { | 306 | { |
307 | |||
308 | } | 307 | } |
309 | 308 | ||
310 | public void Close() | 309 | public void Close() |
@@ -350,7 +349,6 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
350 | if (!Directory.Exists(tmp)) | 349 | if (!Directory.Exists(tmp)) |
351 | Directory.CreateDirectory(tmp); | 350 | Directory.CreateDirectory(tmp); |
352 | 351 | ||
353 | |||
354 | m_log.Info("MRM 2"); | 352 | m_log.Info("MRM 2"); |
355 | 353 | ||
356 | try | 354 | try |
@@ -396,8 +394,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
396 | 394 | ||
397 | parameters.IncludeDebugInformation = true; | 395 | parameters.IncludeDebugInformation = true; |
398 | 396 | ||
399 | string rootPath = | 397 | string rootPath = Path.GetDirectoryName(AppDomain.CurrentDomain.BaseDirectory); |
400 | Path.GetDirectoryName(AppDomain.CurrentDomain.BaseDirectory); | ||
401 | 398 | ||
402 | List<string> libraries = new List<string>(); | 399 | List<string> libraries = new List<string>(); |
403 | string[] lines = Script.Split(new string[] {"\n"}, StringSplitOptions.RemoveEmptyEntries); | 400 | string[] lines = Script.Split(new string[] {"\n"}, StringSplitOptions.RemoveEmptyEntries); |