aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-02-02 17:27:23 +0000
committerJustin Clarke Casey2009-02-02 17:27:23 +0000
commit176920f8d3ddf8dd419e58e059d864f04e74a538 (patch)
tree4f5ffac819017046f11a70250c1d68f44d41c005
parent* Stop the instant message module from trying to register for the message tra... (diff)
downloadopensim-SC_OLD-176920f8d3ddf8dd419e58e059d864f04e74a538.zip
opensim-SC_OLD-176920f8d3ddf8dd419e58e059d864f04e74a538.tar.gz
opensim-SC_OLD-176920f8d3ddf8dd419e58e059d864f04e74a538.tar.bz2
opensim-SC_OLD-176920f8d3ddf8dd419e58e059d864f04e74a538.tar.xz
* Make it more obvious that there is an enabled switch for chat in OpenSim.ini.example.
* Add default information for other chat settings
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs4
-rw-r--r--bin/OpenSim.ini.example10
2 files changed, 11 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs
index df42f07..1109166 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs
@@ -170,7 +170,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
170 case ChatSourceType.Agent: 170 case ChatSourceType.Agent:
171 if (!(scene is Scene)) 171 if (!(scene is Scene))
172 { 172 {
173 m_log.WarnFormat("[CHAT] scene {0} is not a Scene object, cannot obtain scene presence for {1}", 173 m_log.WarnFormat("[CHAT]: scene {0} is not a Scene object, cannot obtain scene presence for {1}",
174 scene.RegionInfo.RegionName, c.Sender.AgentId); 174 scene.RegionInfo.RegionName, c.Sender.AgentId);
175 return; 175 return;
176 } 176 }
@@ -191,7 +191,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
191 if (message.Length >= 1000) // libomv limit 191 if (message.Length >= 1000) // libomv limit
192 message = message.Substring(0, 1000); 192 message = message.Substring(0, 1000);
193 193
194 // m_log.DebugFormat("[CHAT] DCTA: fromID {0} fromName {1}, cType {2}, sType {3}", fromID, fromName, c.Type, sourceType); 194 // m_log.DebugFormat("[CHAT]: DCTA: fromID {0} fromName {1}, cType {2}, sType {3}", fromID, fromName, c.Type, sourceType);
195 195
196 foreach (Scene s in m_scenes) 196 foreach (Scene s in m_scenes)
197 { 197 {
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 98da6ec..ebca45d 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -296,8 +296,16 @@ InterregionComms = "RESTComms"
296 296
297 297
298[Chat] 298[Chat]
299 ; Controls whether the chat module is enabled. Default is true.
300 enabled = true;
301
302 ; Distance in meters that whispers should travel. Default is 10m
299 whisper_distance = 10 303 whisper_distance = 10
304
305 ; Distance in meters that ordinary chat should travel. Default is 30m
300 say_distance = 30 306 say_distance = 30
307
308 ; Distance in meters that shouts should travel. Default is 100m
301 shout_distance = 100 309 shout_distance = 100
302 310
303 311
@@ -988,4 +996,4 @@ InterregionComms = "RESTComms"
988 active_trees = false 996 active_trees = false
989 997
990 ; Density of tree population 998 ; Density of tree population
991 tree_density = 1000.0 \ No newline at end of file 999 tree_density = 1000.0