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

* Removed superfluous int to prevent warning 

* Changed OGSServer on RegionServer to bind to <port> - 500 rather than a single fixed port
* Added support for the grid server to tell us who we are (optional)
0.1-prestable
Adam Frisby 2007-05-04 07:43:07 +00:00
parent 8795dc5ee5
commit 5eacce71ad
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim.RegionServer/OpenSimMain.cs
View File

@ -184,6 +184,16 @@ namespace OpenSim
{ {
this.LocalWorld.m_datastore = ((string)((RemoteGridBase)GridServers.GridServer).GridData["data_uri"]); this.LocalWorld.m_datastore = ((string)((RemoteGridBase)GridServers.GridServer).GridData["data_uri"]);
} }
if (((RemoteGridBase)(GridServers.GridServer)).GridData["regionname"].ToString() != "")
{
// The grid server has told us who we are
// We must obey the grid server.
regionData.RegionLocX = Convert.ToUInt32(((RemoteGridBase)(GridServers.GridServer)).GridData["region_locx"].ToString());
regionData.RegionLocY = Convert.ToUInt32(((RemoteGridBase)(GridServers.GridServer)).GridData["region_locy"].ToString());
regionData.RegionName = ((RemoteGridBase)(GridServers.GridServer)).GridData["regionname"].ToString();
}
} }
@ -224,7 +234,7 @@ namespace OpenSim
if (gridServer.GetName() == "Remote") if (gridServer.GetName() == "Remote")
{ {
// should startup the OGS protocol server here // should startup the OGS protocol server here
OGSServer = new OpenGridProtocolServer(8500); OGSServer = new OpenGridProtocolServer(this.regionData.IPListenPort - 500); // Changed so we can have more than one OGSServer per machine.
// we are in Grid mode so set a XmlRpc handler to handle "expect_user" calls from the user server // we are in Grid mode so set a XmlRpc handler to handle "expect_user" calls from the user server
httpServer.AddXmlRPCHandler("expect_user", httpServer.AddXmlRPCHandler("expect_user",

1
OpenSim.RegionServer/world/Avatar.cs
View File

@ -102,7 +102,6 @@ namespace OpenSim.world
public static void SetupTemplate(string name) public static void SetupTemplate(string name)
{ {
int i = 0;
FileInfo fInfo = new FileInfo(name); FileInfo fInfo = new FileInfo(name);
long numBytes = fInfo.Length; long numBytes = fInfo.Length;
FileStream fStream = new FileStream(name, FileMode.Open, FileAccess.Read); FileStream fStream = new FileStream(name, FileMode.Open, FileAccess.Read);