diff options
author | opensim mirror account | 2010-10-27 21:40:03 -0700 |
---|---|---|
committer | opensim mirror account | 2010-10-27 21:40:03 -0700 |
commit | 71d9fac7577138a95888fdba6e31d8874a4fb86e (patch) | |
tree | d3171597f0954dbb313ce15c0e36bb59017e17a6 /OpenSim | |
parent | Merge branch 'master' of /var/git/opensim/ (diff) | |
parent | Formatting cleanup. (diff) | |
download | opensim-SC-71d9fac7577138a95888fdba6e31d8874a4fb86e.zip opensim-SC-71d9fac7577138a95888fdba6e31d8874a4fb86e.tar.gz opensim-SC-71d9fac7577138a95888fdba6e31d8874a4fb86e.tar.bz2 opensim-SC-71d9fac7577138a95888fdba6e31d8874a4fb86e.tar.xz |
Merge branch 'master' of /var/git/opensim/
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/Minimodule/ExtensionHandler.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/ExtensionHandler.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/ExtensionHandler.cs index d8f7a84..3f1bd54 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/ExtensionHandler.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/ExtensionHandler.cs | |||
@@ -32,7 +32,7 @@ using OpenSim.Region.OptionalModules.Scripting.Minimodule.Interfaces; | |||
32 | 32 | ||
33 | namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | 33 | namespace OpenSim.Region.OptionalModules.Scripting.Minimodule |
34 | { | 34 | { |
35 | class ExtensionHandler : IExtension | 35 | class ExtensionHandler : IExtension |
36 | { | 36 | { |
37 | private readonly Dictionary<Type, object> m_instances; | 37 | private readonly Dictionary<Type, object> m_instances; |
38 | 38 | ||
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs index f47e71c..df60709 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs | |||
@@ -291,7 +291,6 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
291 | 291 | ||
292 | public void InitializeMRM(MRMBase mmb, uint localID, UUID itemID) | 292 | public void InitializeMRM(MRMBase mmb, uint localID, UUID itemID) |
293 | { | 293 | { |
294 | |||
295 | m_log.Info("[MRM] Created MRM Instance"); | 294 | m_log.Info("[MRM] Created MRM Instance"); |
296 | 295 | ||
297 | IWorld world; | 296 | IWorld world; |