ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 03:45:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into bigmerge

Browse Source 
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
This commit is contained in:
Melanie
2011-11-04 01:18:37 +00:00
parent 457195466d b8d50b10fb
commit 24235006f4
27 changed files with 430 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bin/OpenSimDefaults.ini
View File

@@ -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