aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim.RegionServer
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim.RegionServer/OpenSimMain.cs12
-rw-r--r--OpenSim.RegionServer/world/Avatar.cs1
2 files changed, 11 insertions, 2 deletions
diff --git a/OpenSim.RegionServer/OpenSimMain.cs b/OpenSim.RegionServer/OpenSimMain.cs
index 836f57f..61441b2 100644
--- a/OpenSim.RegionServer/OpenSimMain.cs
+++ b/OpenSim.RegionServer/OpenSimMain.cs
@@ -184,6 +184,16 @@ namespace OpenSim
184 { 184 {
185 this.LocalWorld.m_datastore = ((string)((RemoteGridBase)GridServers.GridServer).GridData["data_uri"]); 185 this.LocalWorld.m_datastore = ((string)((RemoteGridBase)GridServers.GridServer).GridData["data_uri"]);
186 } 186 }
187
188 if (((RemoteGridBase)(GridServers.GridServer)).GridData["regionname"].ToString() != "")
189 {
190 // The grid server has told us who we are
191 // We must obey the grid server.
192 regionData.RegionLocX = Convert.ToUInt32(((RemoteGridBase)(GridServers.GridServer)).GridData["region_locx"].ToString());
193 regionData.RegionLocY = Convert.ToUInt32(((RemoteGridBase)(GridServers.GridServer)).GridData["region_locy"].ToString());
194 regionData.RegionName = ((RemoteGridBase)(GridServers.GridServer)).GridData["regionname"].ToString();
195 }
196
187 } 197 }
188 198
189 199
@@ -224,7 +234,7 @@ namespace OpenSim
224 if (gridServer.GetName() == "Remote") 234 if (gridServer.GetName() == "Remote")
225 { 235 {
226 // should startup the OGS protocol server here 236 // should startup the OGS protocol server here
227 OGSServer = new OpenGridProtocolServer(8500); 237 OGSServer = new OpenGridProtocolServer(this.regionData.IPListenPort - 500); // Changed so we can have more than one OGSServer per machine.
228 238
229 // we are in Grid mode so set a XmlRpc handler to handle "expect_user" calls from the user server 239 // we are in Grid mode so set a XmlRpc handler to handle "expect_user" calls from the user server
230 httpServer.AddXmlRPCHandler("expect_user", 240 httpServer.AddXmlRPCHandler("expect_user",
diff --git a/OpenSim.RegionServer/world/Avatar.cs b/OpenSim.RegionServer/world/Avatar.cs
index 97ed78d..7f5fd12 100644
--- a/OpenSim.RegionServer/world/Avatar.cs
+++ b/OpenSim.RegionServer/world/Avatar.cs
@@ -102,7 +102,6 @@ namespace OpenSim.world
102 102
103 public static void SetupTemplate(string name) 103 public static void SetupTemplate(string name)
104 { 104 {
105 int i = 0;
106 FileInfo fInfo = new FileInfo(name); 105 FileInfo fInfo = new FileInfo(name);
107 long numBytes = fInfo.Length; 106 long numBytes = fInfo.Length;
108 FileStream fStream = new FileStream(name, FileMode.Open, FileAccess.Read); 107 FileStream fStream = new FileStream(name, FileMode.Open, FileAccess.Read);