aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs1
-rw-r--r--OpenSim/Region/Environment/Interfaces/ISimChat.cs37
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs5
-rw-r--r--README.txt28
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
292 292
293 public void llOwnerSay(string msg) 293 public void llOwnerSay(string msg)
294 { 294 {
295 m_log.DebugFormat("llOwnerSay(\"{0}\")", msg);
296 World.SimChatBroadcast(Helpers.StringToField(text), 295 World.SimChatBroadcast(Helpers.StringToField(text),
297 ChatTypeEnum.Owner, 0, m_host.AbsolutePosition, 296 ChatTypeEnum.Owner, 0, m_host.AbsolutePosition,
298 m_host.Name, m_host.UUID, false); 297 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 @@
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
28using System;
29using OpenSim.Framework;
30
31namespace 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
42namespace OpenSim.Region.Environment.Modules.Avatar.Chat 42namespace 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
42namespace OpenSim.Region.Environment.Modules.Avatar.Chat 42namespace 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 }
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
25== Installation on Linux == 25== Installation on Linux ==
26 26
27Prereqs: 27Prereqs:
28 * Mono >= 1.2.3.1 28 * Mono >= 1.2.3.1 (>= 1.9 preferable)
29 * Nant >= 0.85 29 * Nant >= 0.85
30 * sqlite3 30 * sqlite3
31 31
32From the distribution type: 32From the distribution type:
33 * ./runprebuild.sh
33 * nant 34 * nant
34 * cd bin 35 * cd bin
35 * mono ./OpenSim.exe 36 * mono ./OpenSim.exe
36 37
37See configuring OpenSim 38See configuring OpenSim
38 39
@@ -60,10 +61,31 @@ By default your sim will be running on http://127.0.0.1:9000. To use
60your OpenSim add -loginuri http://127.0.0.1:9000 to your second life 61your OpenSim add -loginuri http://127.0.0.1:9000 to your second life
61client (running on the same machine as your OpenSim). 62client (running on the same machine as your OpenSim).
62 63
64== Bug reports ==
65
66In the likely event of bugs biting you (err, your OpenSim) we
67encourage you to see whether the problem has already been reported on
68the OpenSim mantis system. You can find the OpenSim mantis system at
69
70 http://opensimulator.org/mantis/main_page.php
71
72If your bug has already been reported, you might want to add to the
73bug description and supply additional information.
74
75If your bug has not been reported yet, file a bug report ("opening a
76mantis"). Useful information to include:
77 * description of what went wrong
78 * stack trace
79 * OpenSim.log (attach as file)
80 * OpenSim.ini (attach as file)
81 * if running under mono: run OpenSim.exe with the "--debug" flag:
82
83 mono --debug OpenSim.exe
84
63== More Information on OpenSim == 85== More Information on OpenSim ==
64 86
65More extensive information on building, running, and configuring 87More extensive information on building, running, and configuring
66OpenSim, as well as how to report bugs, and participate in the OpenSim 88OpenSim, as well as how to report bugs, and participate in the OpenSim
67project can always be found at http://opensimulator.org. 89project can always be found at http://opensimulator.org.
68 90
69Thanks for trying OpenSim, we hope it was a pleasant experience. 91Thanks for trying OpenSim, we hope it is a pleasant experience.