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 /OpenSim/Region/CoreModules/Scripting | |
| parent | Merge branch 'master' into bigmerge (diff) | |
| parent | Rename ForEachAvatar back to ForEachScenePresence. The other changes (diff) | |
| download | opensim-SC-24235006f473cec56213705ce70df781cf9bcbc1.zip opensim-SC-24235006f473cec56213705ce70df781cf9bcbc1.tar.gz opensim-SC-24235006f473cec56213705ce70df781cf9bcbc1.tar.bz2 opensim-SC-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 '')
| -rw-r--r-- | OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
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 |