Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-10-29 20:40:48 +01:00
32 changed files with 1084 additions and 911 deletions

View File

@@ -32,7 +32,7 @@ using OpenSim.Region.OptionalModules.Scripting.Minimodule.Interfaces;
namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
{
class ExtensionHandler : IExtension
class ExtensionHandler : IExtension
{
private readonly Dictionary<Type, object> m_instances;

View File

@@ -291,7 +291,6 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
public void InitializeMRM(MRMBase mmb, uint localID, UUID itemID)
{
m_log.Info("[MRM] Created MRM Instance");
IWorld world;