5 files changed, 29 insertions, 44 deletions

diff --git a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
index b06a457..f8ab087 100644
--- a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
@@ -292,7 +292,6 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler
 
         public void llOwnerSay(string msg)
         {
-            m_log.DebugFormat("llOwnerSay(\"{0}\")", msg);
             World.SimChatBroadcast(Helpers.StringToField(text),
                                    ChatTypeEnum.Owner, 0, m_host.AbsolutePosition, 
                                    m_host.Name, m_host.UUID, false);
diff --git a/OpenSim/Region/Environment/Interfaces/ISimChat.cs b/OpenSim/Region/Environment/Interfaces/ISimChat.cs
deleted file mode 100644
index d52e58b..0000000
--- a/OpenSim/Region/Environment/Interfaces/ISimChat.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using OpenSim.Framework;
-
-namespace OpenSim.Region.Environment.Interfaces
-{
-    public interface ISimChat
-    {
-        void SimChat(Object sender, ChatFromViewerArgs e);
-    }
-}
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs
index c3fc26e..89437c5 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs
@@ -41,7 +41,7 @@ using OpenSim.Region.Environment.Scenes;
 
 namespace OpenSim.Region.Environment.Modules.Avatar.Chat
 {
-    public class ChatModule : IRegionModule, ISimChat
+    public class ChatModule : IRegionModule
     {
         private static readonly ILog m_log =
             LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs
index 452ea7b..a31d620 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs
@@ -41,7 +41,7 @@ using OpenSim.Region.Environment.Scenes;
 
 namespace OpenSim.Region.Environment.Modules.Avatar.Chat
 {
-    public class IRCBridgeModule : IRegionModule, ISimChat
+    public class IRCBridgeModule : IRegionModule
     {
         private static readonly ILog m_log = 
             LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -466,7 +466,8 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
                 }
                 catch (Exception e)
                 {
-                    Console.WriteLine(e.ToString());
+                    m_log.ErrorFormat("[IRC] cannot connect to {0}:{1}: {2}", 
+                                      m_server, m_port, e.Message);
                 }
                 return m_connected;
             }
diff --git a/README.txt b/README.txt
index 6a3acf2..18c9a04 100644
--- a/README.txt
+++ b/README.txt
@@ -25,14 +25,15 @@ See configuring OpenSim
 == Installation on Linux ==
 
 Prereqs:
- * Mono >= 1.2.3.1
+ * Mono >= 1.2.3.1 (>= 1.9 preferable)
  * Nant >= 0.85
  * sqlite3
 
 From the distribution type:
+ * ./runprebuild.sh
  * nant
  * cd bin
- * mono ./OpenSim.exe
+ * mono ./OpenSim.exe 
 
 See configuring OpenSim
 
@@ -60,10 +61,31 @@ By default your sim will be running on http://127.0.0.1:9000.  To use
 your OpenSim add -loginuri http://127.0.0.1:9000 to your second life
 client (running on the same machine as your OpenSim).
 
+== Bug reports ==
+
+In the likely event of bugs biting you (err, your OpenSim) we
+encourage you to see whether the problem has already been reported on
+the OpenSim mantis system. You can find the OpenSim mantis system at
+
+    http://opensimulator.org/mantis/main_page.php
+
+If your bug has already been reported, you might want to add to the
+bug description and supply additional information. 
+
+If your bug has not been reported yet, file a bug report ("opening a
+mantis"). Useful information to include: 
+ * description of what went wrong 
+ * stack trace 
+ * OpenSim.log (attach as file) 
+ * OpenSim.ini (attach as file) 
+ * if running under mono: run OpenSim.exe with the "--debug" flag:
+
+       mono --debug OpenSim.exe
+
 == More Information on OpenSim ==
 
 More extensive information on building, running, and configuring
 OpenSim, as well as how to report bugs, and participate in the OpenSim
 project can always be found at http://opensimulator.org.
 
-Thanks for trying OpenSim, we hope it was a pleasant experience.
+Thanks for trying OpenSim, we hope it is a pleasant experience.