OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

From: Dr Schofield <hud@zurich.ibm.com> 

Rename SearializableRegionInfo to SerializableRegionInfo (class was already named correctly)
0.6.0-stable
Justin Clarke Casey 2008-05-14 17:03:25 +00:00
parent cbb15ff446
commit 8fe9943293
7 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/Communications/IInterRegionCommunications.cs
View File

@ -36,7 +36,7 @@ namespace OpenSim.Framework.Communications
void CheckRegion(string address, uint port); void CheckRegion(string address, uint port);
bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData); bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData);
bool InformRegionOfPrimCrossing(ulong regionHandle, LLUUID primID, string objData, int XMLMethod); bool InformRegionOfPrimCrossing(ulong regionHandle, LLUUID primID, string objData, int XMLMethod);
bool RegionUp(SearializableRegionInfo region, ulong regionhandle); bool RegionUp(SerializableRegionInfo region, ulong regionhandle);
bool ChildAgentUpdate(ulong regionHandle, ChildAgentDataUpdate cAgentData); bool ChildAgentUpdate(ulong regionHandle, ChildAgentDataUpdate cAgentData);
bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying); bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying);

2
OpenSim/Framework/RegionInfo.cs
View File

@ -233,7 +233,7 @@ namespace OpenSim.Framework
{ {
} }
public RegionInfo(SearializableRegionInfo ConvertFrom) public RegionInfo(SerializableRegionInfo ConvertFrom)
{ {
m_regionLocX = ConvertFrom.RegionLocX; m_regionLocX = ConvertFrom.RegionLocX;
m_regionLocY = ConvertFrom.RegionLocY; m_regionLocY = ConvertFrom.RegionLocY;

10
OpenSim/Framework/SerializableRegionInfo.cs
View File

@ -33,7 +33,7 @@ using libsecondlife;
namespace OpenSim.Framework namespace OpenSim.Framework
{ {
[Serializable] [Serializable]
public class SearializableRegionInfo public class SerializableRegionInfo
{ {
public bool m_allow_alternate_ports; public bool m_allow_alternate_ports;
protected string m_externalHostName; protected string m_externalHostName;
@ -60,11 +60,11 @@ namespace OpenSim.Framework
/// <summary> /// <summary>
/// This is a serializable version of RegionInfo /// This is a serializable version of RegionInfo
/// </summary> /// </summary>
public SearializableRegionInfo() public SerializableRegionInfo()
{ {
} }
public SearializableRegionInfo(RegionInfo ConvertFrom) public SerializableRegionInfo(RegionInfo ConvertFrom)
{ {
m_regionLocX = ConvertFrom.RegionLocX; m_regionLocX = ConvertFrom.RegionLocX;
m_regionLocY = ConvertFrom.RegionLocY; m_regionLocY = ConvertFrom.RegionLocY;
@ -80,7 +80,7 @@ namespace OpenSim.Framework
ServerURI = ConvertFrom.ServerURI; ServerURI = ConvertFrom.ServerURI;
} }
public SearializableRegionInfo(uint regionLocX, uint regionLocY, IPEndPoint internalEndPoint, string externalUri) public SerializableRegionInfo(uint regionLocX, uint regionLocY, IPEndPoint internalEndPoint, string externalUri)
{ {
m_regionLocX = regionLocX; m_regionLocX = regionLocX;
m_regionLocY = regionLocY; m_regionLocY = regionLocY;
@ -89,7 +89,7 @@ namespace OpenSim.Framework
m_externalHostName = externalUri; m_externalHostName = externalUri;
} }
public SearializableRegionInfo(uint regionLocX, uint regionLocY, string externalUri, uint port) public SerializableRegionInfo(uint regionLocX, uint regionLocY, string externalUri, uint port)
{ {
m_regionLocX = regionLocX; m_regionLocX = regionLocX;
m_regionLocY = regionLocY; m_regionLocY = regionLocY;

2
OpenSim/Region/Communications/Local/LocalBackEndServices.cs
View File

@ -227,7 +227,7 @@ namespace OpenSim.Region.Communications.Local
return false; return false;
} }
public virtual bool RegionUp(SearializableRegionInfo sregion, ulong regionhandle) public virtual bool RegionUp(SerializableRegionInfo sregion, ulong regionhandle)
{ {
RegionInfo region = new RegionInfo(sregion); RegionInfo region = new RegionInfo(sregion);

8
OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
View File

@ -852,9 +852,9 @@ namespace OpenSim.Region.Communications.OGS1
} }
// UGLY! // UGLY!
public bool RegionUp(SearializableRegionInfo region, ulong regionhandle) public bool RegionUp(SerializableRegionInfo region, ulong regionhandle)
{ {
SearializableRegionInfo regInfo = null; SerializableRegionInfo regInfo = null;
try try
{ {
// You may ask why this is in here... // You may ask why this is in here...
@ -863,7 +863,7 @@ namespace OpenSim.Region.Communications.OGS1
// it's own remoting port! How special. // it's own remoting port! How special.
RegionUpData regiondata = new RegionUpData(region.RegionLocX, region.RegionLocY, region.ExternalHostName, region.InternalEndPoint.Port); RegionUpData regiondata = new RegionUpData(region.RegionLocX, region.RegionLocY, region.ExternalHostName, region.InternalEndPoint.Port);
region = new SearializableRegionInfo(RequestNeighbourInfo(region.RegionHandle)); region = new SerializableRegionInfo(RequestNeighbourInfo(region.RegionHandle));
region.RemotingAddress = region.ExternalHostName; region.RemotingAddress = region.ExternalHostName;
region.RemotingPort = NetworkServersInfo.RemotingListenerPort; region.RemotingPort = NetworkServersInfo.RemotingListenerPort;
region.HttpPort = serversInfo.HttpListenerPort; region.HttpPort = serversInfo.HttpListenerPort;
@ -873,7 +873,7 @@ namespace OpenSim.Region.Communications.OGS1
return true; return true;
} }
regInfo = new SearializableRegionInfo(RequestNeighbourInfo(regionhandle)); regInfo = new SerializableRegionInfo(RequestNeighbourInfo(regionhandle));
if (regInfo != null) if (regInfo != null)
{ {
// If we're not trying to remote to ourselves. // If we're not trying to remote to ourselves.

4
OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
View File

@ -356,7 +356,7 @@ namespace OpenSim.Region.Environment.Scenes
//RegionUpData regiondata = new RegionUpData(region.RegionLocX, region.RegionLocY, region.ExternalHostName, region.InternalEndPoint.Port); //RegionUpData regiondata = new RegionUpData(region.RegionLocX, region.RegionLocY, region.ExternalHostName, region.InternalEndPoint.Port);
bool regionAccepted = bool regionAccepted =
m_commsProvider.InterRegion.RegionUp(new SearializableRegionInfo(region), regionhandle); m_commsProvider.InterRegion.RegionUp(new SerializableRegionInfo(region), regionhandle);
if (regionAccepted) if (regionAccepted)
{ {
@ -399,7 +399,7 @@ namespace OpenSim.Region.Environment.Scenes
} }
} }
//bool val = m_commsProvider.InterRegion.RegionUp(new SearializableRegionInfo(region)); //bool val = m_commsProvider.InterRegion.RegionUp(new SerializableRegionInfo(region));
} }
public delegate void SendChildAgentDataUpdateDelegate(ChildAgentDataUpdate cAgentData, ScenePresence presence); public delegate void SendChildAgentDataUpdateDelegate(ChildAgentDataUpdate cAgentData, ScenePresence presence);

4
ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs vendored
View File

@ -422,7 +422,7 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer
} }
// serialization of region data // serialization of region data
SearializableRegionInfo dst_region = new SearializableRegionInfo(src_region); SerializableRegionInfo dst_region = new SerializableRegionInfo(src_region);
string filename = export_dir + "RegionInfo_" + src_region.RegionID + ".bin"; string filename = export_dir + "RegionInfo_" + src_region.RegionID + ".bin";
Util.SerializeToFile(filename, dst_region); Util.SerializeToFile(filename, dst_region);
@ -480,7 +480,7 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer
{ {
m_log.InfoFormat("[BALANCER] RegionInfo filename = [{0}]", filename); m_log.InfoFormat("[BALANCER] RegionInfo filename = [{0}]", filename);
dst_region = new RegionInfo((SearializableRegionInfo) Util.DeserializeFromFile(filename)); dst_region = new RegionInfo((SerializableRegionInfo) Util.DeserializeFromFile(filename));
m_log.InfoFormat("[BALANCER] " + "RegionID = [{0}]", dst_region.RegionID.ToString()); m_log.InfoFormat("[BALANCER] " + "RegionID = [{0}]", dst_region.RegionID.ToString());
m_log.InfoFormat("[BALANCER] " + "RegionHandle = [{0}]", dst_region.RegionHandle); m_log.InfoFormat("[BALANCER] " + "RegionHandle = [{0}]", dst_region.RegionHandle);