diff options
| author | Melanie | 2009-08-08 01:43:28 +0100 |
|---|---|---|
| committer | Melanie | 2009-08-08 01:43:28 +0100 |
| commit | 0b0ed200f66bb8ab3c139d85263e7c8e81117791 (patch) | |
| tree | 49af5e09fa54c4ef1d441ebd58ab9c6bf4a242fd /OpenSim/Region/OptionalModules/Avatar | |
| parent | Change the default for internal IP address back to 0.0.0.0 (diff) | |
| parent | Merge branch 'master' of ssh://MyConnection/var/git/opensim (diff) | |
| download | opensim-SC_OLD-0b0ed200f66bb8ab3c139d85263e7c8e81117791.zip opensim-SC_OLD-0b0ed200f66bb8ab3c139d85263e7c8e81117791.tar.gz opensim-SC_OLD-0b0ed200f66bb8ab3c139d85263e7c8e81117791.tar.bz2 opensim-SC_OLD-0b0ed200f66bb8ab3c139d85263e7c8e81117791.tar.xz | |
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs | 4 | ||||
| -rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/Chat/RegionState.cs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs index 2f1dbc1..9273fb5 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs | |||
| @@ -50,8 +50,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat | |||
| 50 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 50 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
| 51 | 51 | ||
| 52 | // Local constants | 52 | // Local constants |
| 53 | 53 | ||
| 54 | private static readonly Vector3 CenterOfRegion = new Vector3(128, 128, 20); | 54 | private static readonly Vector3 CenterOfRegion = new Vector3(((int)Constants.RegionSize * 0.5f), ((int)Constants.RegionSize * 0.5f), 20); |
| 55 | private static readonly char[] CS_SPACE = { ' ' }; | 55 | private static readonly char[] CS_SPACE = { ' ' }; |
| 56 | 56 | ||
| 57 | private const int WD_INTERVAL = 1000; // base watchdog interval | 57 | private const int WD_INTERVAL = 1000; // base watchdog interval |
diff --git a/OpenSim/Region/OptionalModules/Avatar/Chat/RegionState.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/RegionState.cs index ba3f3e5..203948e 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Chat/RegionState.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Chat/RegionState.cs | |||
| @@ -45,7 +45,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat | |||
| 45 | private static readonly ILog m_log = | 45 | private static readonly ILog m_log = |
| 46 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 46 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
| 47 | 47 | ||
| 48 | private static readonly OpenMetaverse.Vector3 CenterOfRegion = new OpenMetaverse.Vector3(128, 128, 20); | 48 | private static readonly OpenMetaverse.Vector3 CenterOfRegion = new OpenMetaverse.Vector3(((int)Constants.RegionSize * 0.5f), ((int)Constants.RegionSize * 0.5f), 20); |
| 49 | private const int DEBUG_CHANNEL = 2147483647; | 49 | private const int DEBUG_CHANNEL = 2147483647; |
| 50 | 50 | ||
| 51 | private static int _idk_ = 0; | 51 | private static int _idk_ = 0; |