diff options
author | Dr Scofield | 2008-05-27 08:21:59 +0000 |
---|---|---|
committer | Dr Scofield | 2008-05-27 08:21:59 +0000 |
commit | a2f8f58f7d71c9f7307938574d24822f41ab1e7b (patch) | |
tree | af8b361f465471bfc0ae432f0ff5e0d1026274f2 /OpenSim/Region | |
parent | * Assigns a random UUID to a region if the Sim UUID is null. (diff) | |
download | opensim-SC_OLD-a2f8f58f7d71c9f7307938574d24822f41ab1e7b.zip opensim-SC_OLD-a2f8f58f7d71c9f7307938574d24822f41ab1e7b.tar.gz opensim-SC_OLD-a2f8f58f7d71c9f7307938574d24822f41ab1e7b.tar.bz2 opensim-SC_OLD-a2f8f58f7d71c9f7307938574d24822f41ab1e7b.tar.xz |
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
Diffstat (limited to 'OpenSim/Region')
3 files changed, 4 insertions, 40 deletions
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 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System; | ||
29 | using OpenSim.Framework; | ||
30 | |||
31 | namespace OpenSim.Region.Environment.Interfaces | ||
32 | { | ||
33 | public interface ISimChat | ||
34 | { | ||
35 | void SimChat(Object sender, ChatFromViewerArgs e); | ||
36 | } | ||
37 | } | ||
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; | |||
41 | 41 | ||
42 | namespace OpenSim.Region.Environment.Modules.Avatar.Chat | 42 | namespace OpenSim.Region.Environment.Modules.Avatar.Chat |
43 | { | 43 | { |
44 | public class ChatModule : IRegionModule, ISimChat | 44 | public class ChatModule : IRegionModule |
45 | { | 45 | { |
46 | private static readonly ILog m_log = | 46 | private static readonly ILog m_log = |
47 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 47 | 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; | |||
41 | 41 | ||
42 | namespace OpenSim.Region.Environment.Modules.Avatar.Chat | 42 | namespace OpenSim.Region.Environment.Modules.Avatar.Chat |
43 | { | 43 | { |
44 | public class IRCBridgeModule : IRegionModule, ISimChat | 44 | public class IRCBridgeModule : IRegionModule |
45 | { | 45 | { |
46 | private static readonly ILog m_log = | 46 | private static readonly ILog m_log = |
47 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 47 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
@@ -466,7 +466,8 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat | |||
466 | } | 466 | } |
467 | catch (Exception e) | 467 | catch (Exception e) |
468 | { | 468 | { |
469 | Console.WriteLine(e.ToString()); | 469 | m_log.ErrorFormat("[IRC] cannot connect to {0}:{1}: {2}", |
470 | m_server, m_port, e.Message); | ||
470 | } | 471 | } |
471 | return m_connected; | 472 | return m_connected; |
472 | } | 473 | } |