diff options
author | Sean Dague | 2008-04-15 14:18:37 +0000 |
---|---|---|
committer | Sean Dague | 2008-04-15 14:18:37 +0000 |
commit | 62d02e079eff3e6108bc4956e34fe5dd8f5cfcad (patch) | |
tree | beea7f139f302110e16154d59f2d699c40de7aef /OpenSim/Region/Environment/Scenes/SceneManager.cs | |
parent | Update svn properties. (diff) | |
download | opensim-SC-62d02e079eff3e6108bc4956e34fe5dd8f5cfcad.zip opensim-SC-62d02e079eff3e6108bc4956e34fe5dd8f5cfcad.tar.gz opensim-SC-62d02e079eff3e6108bc4956e34fe5dd8f5cfcad.tar.bz2 opensim-SC-62d02e079eff3e6108bc4956e34fe5dd8f5cfcad.tar.xz |
From: dirk husemann <hud@zurich.ibm.com>
attached is a patch set that
* adds further robustness checks for the CreateUser and CreateRegion
XmlRpc
* fixes SceneManager.TryGetScene(IPEndPoint, Scene) --- contrary to my
expectation IPEndPoint.Address is not sufficient for a comparision,
IPEndPoint.Address.Address (the long representation) does work
however.
* add [RemoteAdmin] section to OpenSim.ini.example
* fixes XML doc comments
good night,
dirk
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneManager.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneManager.cs b/OpenSim/Region/Environment/Scenes/SceneManager.cs index fbaf655..42a77dd 100644 --- a/OpenSim/Region/Environment/Scenes/SceneManager.cs +++ b/OpenSim/Region/Environment/Scenes/SceneManager.cs | |||
@@ -297,8 +297,10 @@ namespace OpenSim.Region.Environment.Scenes | |||
297 | { | 297 | { |
298 | foreach (Scene mscene in m_localScenes) | 298 | foreach (Scene mscene in m_localScenes) |
299 | { | 299 | { |
300 | if (mscene.RegionInfo.InternalEndPoint.Address == ipEndPoint.Address && | 300 | // .NET WEIRDNESS ALERT: need to compare the long |
301 | mscene.RegionInfo.InternalEndPoint.Port == ipEndPoint.Port) | 301 | // values of address... |
302 | if ((mscene.RegionInfo.InternalEndPoint.Address.Address == ipEndPoint.Address.Address) && | ||
303 | (mscene.RegionInfo.InternalEndPoint.Port == ipEndPoint.Port)) | ||
302 | { | 304 | { |
303 | scene = mscene; | 305 | scene = mscene; |
304 | return true; | 306 | return true; |