From a2f8f58f7d71c9f7307938574d24822f41ab1e7b Mon Sep 17 00:00:00 2001
From: Dr Scofield
Date: Tue, 27 May 2008 08:21:59 +0000
Subject: I'm dropping the ISimChat interface as that has now been replaced by
 EventManager events.

also, i've added instructions to README.txt about running 
runprebuild.sh and on how to report bugs.

plus some minor fixes (dropping m_log statement left over 
from debugging llOwnerSay, nicer catch of exception in 
IRCBridgeModule



---
 .../Compiler/Server_API/LSL_BuiltIn_Commands.cs    |  1 -
 OpenSim/Region/Environment/Interfaces/ISimChat.cs  | 37 ----------------------
 .../Environment/Modules/Avatar/Chat/ChatModule.cs  |  2 +-
 .../Modules/Avatar/Chat/IRCBridgeModule.cs         |  5 +--
 4 files changed, 4 insertions(+), 41 deletions(-)
 delete mode 100644 OpenSim/Region/Environment/Interfaces/ISimChat.cs

(limited to 'OpenSim')

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;
             }
-- 
cgit v1.1