diff options
author | Justin Clark-Casey (justincc) | 2011-11-02 20:05:31 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-11-02 20:05:31 +0000 |
commit | 59232a6ea8739f4a83c21771e550893e75672b50 (patch) | |
tree | 47c4201a06fe9ca57612e765a47a7b86fbc01ffa | |
parent | Get some hopefully more useful exception information when OpenJPEG.EncodeFrom... (diff) | |
download | opensim-SC-59232a6ea8739f4a83c21771e550893e75672b50.zip opensim-SC-59232a6ea8739f4a83c21771e550893e75672b50.tar.gz opensim-SC-59232a6ea8739f4a83c21771e550893e75672b50.tar.bz2 opensim-SC-59232a6ea8739f4a83c21771e550893e75672b50.tar.xz |
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.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs | 2 | ||||
-rwxr-xr-x | bin/OpenSim.ini.example | 4 | ||||
-rw-r--r-- | 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 2cd71c4..f5cc4c3 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 | |||
45 | private const int DEBUG_CHANNEL = 2147483647; | 45 | private const int DEBUG_CHANNEL = 2147483647; |
46 | 46 | ||
47 | private bool m_enabled = true; | 47 | private bool m_enabled = true; |
48 | private int m_saydistance = 30; | 48 | private int m_saydistance = 20; |
49 | private int m_shoutdistance = 100; | 49 | private int m_shoutdistance = 100; |
50 | private int m_whisperdistance = 10; | 50 | private int m_whisperdistance = 10; |
51 | private List<Scene> m_scenes = new List<Scene>(); | 51 | private List<Scene> m_scenes = new List<Scene>(); |
diff --git a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs index a14a84b..640a60b 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 | |||
95 | private Queue m_pendingQ; | 95 | private Queue m_pendingQ; |
96 | private Scene m_scene; | 96 | private Scene m_scene; |
97 | private int m_whisperdistance = 10; | 97 | private int m_whisperdistance = 10; |
98 | private int m_saydistance = 30; | 98 | private int m_saydistance = 20; |
99 | private int m_shoutdistance = 100; | 99 | private int m_shoutdistance = 100; |
100 | 100 | ||
101 | #region IRegionModule Members | 101 | #region IRegionModule Members |
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 @@ | |||
339 | ;; Distance in meters that whispers should travel. | 339 | ;; Distance in meters that whispers should travel. |
340 | ; whisper_distance = 10 | 340 | ; whisper_distance = 10 |
341 | 341 | ||
342 | ;# {say_distance} {} {Distance at which normal chat is heard, in meters? (SL uses 20 here)} {} 30 | 342 | ;# {say_distance} {} {Distance at which normal chat is heard, in meters?} {} 20 |
343 | ;; Distance in meters that ordinary chat should travel. | 343 | ;; Distance in meters that ordinary chat should travel. |
344 | ; say_distance = 30 | 344 | ; say_distance = 20 |
345 | 345 | ||
346 | ;# {shout_distance} {Distance at which a shout is heard, in meters?} {} 100 | 346 | ;# {shout_distance} {Distance at which a shout is heard, in meters?} {} 100 |
347 | ;; Distance in meters that shouts should travel. | 347 | ;; Distance in meters that shouts should travel. |
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index d79cb1e..bf1976c 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 |