Merge branch 'master' into bigmerge

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
	OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
	OpenSim/Region/CoreModules/LightShare/LightShareModule.cs
	OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs

2 files changed, 4 insertions, 4 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 80f4c0e..e71fb05 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 e9d8717..a02de72 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