diff options
| author | Melanie | 2011-11-04 01:18:37 +0000 |
|---|---|---|
| committer | Melanie | 2011-11-04 01:18:37 +0000 |
| commit | 24235006f473cec56213705ce70df781cf9bcbc1 (patch) | |
| tree | 7d0e75978d48272827c3f03f087bf79658dd16cf /bin/OpenSimDefaults.ini | |
| parent | Merge branch 'master' into bigmerge (diff) | |
| parent | Rename ForEachAvatar back to ForEachScenePresence. The other changes (diff) | |
| download | opensim-SC_OLD-24235006f473cec56213705ce70df781cf9bcbc1.zip opensim-SC_OLD-24235006f473cec56213705ce70df781cf9bcbc1.tar.gz opensim-SC_OLD-24235006f473cec56213705ce70df781cf9bcbc1.tar.bz2 opensim-SC_OLD-24235006f473cec56213705ce70df781cf9bcbc1.tar.xz | |
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
Diffstat (limited to 'bin/OpenSimDefaults.ini')
| -rw-r--r-- | bin/OpenSimDefaults.ini | 4 |
1 files changed, 2 insertions, 2 deletions
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 @@ | |||
| 563 | ; Distance in meters that whispers should travel. Default is 10m | 563 | ; Distance in meters that whispers should travel. Default is 10m |
| 564 | whisper_distance = 10 | 564 | whisper_distance = 10 |
| 565 | 565 | ||
| 566 | ; Distance in meters that ordinary chat should travel. Default is 30m | 566 | ; Distance in meters that ordinary chat should travel. Default is 20m |
| 567 | say_distance = 30 | 567 | say_distance = 20 |
| 568 | 568 | ||
| 569 | ; Distance in meters that shouts should travel. Default is 100m | 569 | ; Distance in meters that shouts should travel. Default is 100m |
| 570 | shout_distance = 100 | 570 | shout_distance = 100 |