diff options
author | Justin Clarke Casey | 2008-05-14 17:03:25 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-05-14 17:03:25 +0000 |
commit | 8fe9943293f7e6230538bb1e661e85fa89217da6 (patch) | |
tree | 4c4a8d61e2a61954a78ba1d45449aa49a1be685f /OpenSim/Region/Communications | |
parent | * Applying patch from Melanie to expose godlevel to modules. (diff) | |
download | opensim-SC-8fe9943293f7e6230538bb1e661e85fa89217da6.zip opensim-SC-8fe9943293f7e6230538bb1e661e85fa89217da6.tar.gz opensim-SC-8fe9943293f7e6230538bb1e661e85fa89217da6.tar.bz2 opensim-SC-8fe9943293f7e6230538bb1e661e85fa89217da6.tar.xz |
From: Dr Schofield <hud@zurich.ibm.com>
Rename SearializableRegionInfo to SerializableRegionInfo (class was already named correctly)
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Communications/Local/LocalBackEndServices.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs index b2550af..39cf911 100644 --- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs +++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs | |||
@@ -227,7 +227,7 @@ namespace OpenSim.Region.Communications.Local | |||
227 | return false; | 227 | return false; |
228 | } | 228 | } |
229 | 229 | ||
230 | public virtual bool RegionUp(SearializableRegionInfo sregion, ulong regionhandle) | 230 | public virtual bool RegionUp(SerializableRegionInfo sregion, ulong regionhandle) |
231 | { | 231 | { |
232 | RegionInfo region = new RegionInfo(sregion); | 232 | RegionInfo region = new RegionInfo(sregion); |
233 | 233 | ||
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs index 03fd448..fb8dcf6 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | |||
@@ -852,9 +852,9 @@ namespace OpenSim.Region.Communications.OGS1 | |||
852 | } | 852 | } |
853 | 853 | ||
854 | // UGLY! | 854 | // UGLY! |
855 | public bool RegionUp(SearializableRegionInfo region, ulong regionhandle) | 855 | public bool RegionUp(SerializableRegionInfo region, ulong regionhandle) |
856 | { | 856 | { |
857 | SearializableRegionInfo regInfo = null; | 857 | SerializableRegionInfo regInfo = null; |
858 | try | 858 | try |
859 | { | 859 | { |
860 | // You may ask why this is in here... | 860 | // You may ask why this is in here... |
@@ -863,7 +863,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
863 | // it's own remoting port! How special. | 863 | // it's own remoting port! How special. |
864 | RegionUpData regiondata = new RegionUpData(region.RegionLocX, region.RegionLocY, region.ExternalHostName, region.InternalEndPoint.Port); | 864 | RegionUpData regiondata = new RegionUpData(region.RegionLocX, region.RegionLocY, region.ExternalHostName, region.InternalEndPoint.Port); |
865 | 865 | ||
866 | region = new SearializableRegionInfo(RequestNeighbourInfo(region.RegionHandle)); | 866 | region = new SerializableRegionInfo(RequestNeighbourInfo(region.RegionHandle)); |
867 | region.RemotingAddress = region.ExternalHostName; | 867 | region.RemotingAddress = region.ExternalHostName; |
868 | region.RemotingPort = NetworkServersInfo.RemotingListenerPort; | 868 | region.RemotingPort = NetworkServersInfo.RemotingListenerPort; |
869 | region.HttpPort = serversInfo.HttpListenerPort; | 869 | region.HttpPort = serversInfo.HttpListenerPort; |
@@ -873,7 +873,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
873 | return true; | 873 | return true; |
874 | } | 874 | } |
875 | 875 | ||
876 | regInfo = new SearializableRegionInfo(RequestNeighbourInfo(regionhandle)); | 876 | regInfo = new SerializableRegionInfo(RequestNeighbourInfo(regionhandle)); |
877 | if (regInfo != null) | 877 | if (regInfo != null) |
878 | { | 878 | { |
879 | // If we're not trying to remote to ourselves. | 879 | // If we're not trying to remote to ourselves. |