From 59232a6ea8739f4a83c21771e550893e75672b50 Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Wed, 2 Nov 2011 20:05:31 +0000 Subject: [PATCH] Change default say distance to 20m from 30m, the same as on the big grid. This is to improve the migration of scripts that expect a 20m say distance. If you want to keep a 30m say distance then please set this as the say_distance parameter in the [Chat] section of OpenSim.ini. --- OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs | 2 +- .../Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs | 2 +- bin/OpenSim.ini.example | 4 ++-- bin/OpenSimDefaults.ini | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs index 2cd71c4e87..f5cc4c35eb 100644 --- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs @@ -45,7 +45,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat private const int DEBUG_CHANNEL = 2147483647; private bool m_enabled = true; - private int m_saydistance = 30; + private int m_saydistance = 20; private int m_shoutdistance = 100; private int m_whisperdistance = 10; private List m_scenes = new List(); diff --git a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs index a14a84b42a..640a60be04 100644 --- a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs @@ -95,7 +95,7 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm private Queue m_pendingQ; private Scene m_scene; private int m_whisperdistance = 10; - private int m_saydistance = 30; + private int m_saydistance = 20; private int m_shoutdistance = 100; #region IRegionModule Members diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 80f4c0ed92..e71fb05e13 100755 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example @@ -339,9 +339,9 @@ ;; Distance in meters that whispers should travel. ; whisper_distance = 10 - ;# {say_distance} {} {Distance at which normal chat is heard, in meters? (SL uses 20 here)} {} 30 + ;# {say_distance} {} {Distance at which normal chat is heard, in meters?} {} 20 ;; Distance in meters that ordinary chat should travel. - ; say_distance = 30 + ; say_distance = 20 ;# {shout_distance} {Distance at which a shout is heard, in meters?} {} 100 ;; Distance in meters that shouts should travel. diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index d79cb1e3ca..bf1976c769 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -563,8 +563,8 @@ ; Distance in meters that whispers should travel. Default is 10m whisper_distance = 10 - ; Distance in meters that ordinary chat should travel. Default is 30m - say_distance = 30 + ; Distance in meters that ordinary chat should travel. Default is 20m + say_distance = 20 ; Distance in meters that shouts should travel. Default is 100m shout_distance = 100