diff options
| author | Melanie | 2010-10-29 20:40:48 +0100 |
|---|---|---|
| committer | Melanie | 2010-10-29 20:40:48 +0100 |
| commit | 9331898c320d7d6046c6d1ad467cdee0e32c8b71 (patch) | |
| tree | 917ff7facdeb38d96f5f69576a134cbad4776eae /OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs | |
| parent | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff) | |
| parent | Merge branch 'dev-appearance' (diff) | |
| download | opensim-SC-9331898c320d7d6046c6d1ad467cdee0e32c8b71.zip opensim-SC-9331898c320d7d6046c6d1ad467cdee0e32c8b71.tar.gz opensim-SC-9331898c320d7d6046c6d1ad467cdee0e32c8b71.tar.bz2 opensim-SC-9331898c320d7d6046c6d1ad467cdee0e32c8b71.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs | 1 |
1 files changed, 0 insertions, 1 deletions
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; |