Merge git://opensimulator.org/git/opensim

2 files changed, 2 insertions, 9 deletions

diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/LOParcel.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/LOParcel.cs
index 8df020f..c898da6 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/LOParcel.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/LOParcel.cs
@@ -25,6 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
index df60709..74f5208 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
@@ -75,7 +75,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
 
                 if (source.Configs["MRM"].GetBoolean("Enabled", false))
                 {
-                    m_log.Info("[MRM] Enabling MRM Module");
+                    m_log.Info("[MRM]: Enabling MRM Module");
                     m_scene = scene;
 
                     // when hidden, we don't listen for client initiated script events
@@ -90,14 +90,6 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
 
                     scene.RegisterModuleInterface<IMRMModule>(this);
                 }
-                else
-                {
-                    m_log.Info("[MRM] Disabled MRM Module (Disabled in ini)");
-                }
-            }
-            else
-            {
-                m_log.Info("[MRM] Disabled MRM Module (Default disabled)");
             }
         }