aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorAdam Frisby2007-07-14 21:01:31 +0000
committerAdam Frisby2007-07-14 21:01:31 +0000
commit382b6a32c1674fb3fb2c1d334f30deed5353451d (patch)
tree0d148a618c7ba15b20309b1a420d6e7962ab22c3 /OpenSim
parent* Taking antother stab at #166 (diff)
downloadopensim-SC_OLD-382b6a32c1674fb3fb2c1d334f30deed5353451d.zip
opensim-SC_OLD-382b6a32c1674fb3fb2c1d334f30deed5353451d.tar.gz
opensim-SC_OLD-382b6a32c1674fb3fb2c1d334f30deed5353451d.tar.bz2
opensim-SC_OLD-382b6a32c1674fb3fb2c1d334f30deed5353451d.tar.xz
* Upgraded MySQL Connector to support 1222 changes.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/Data.MySQL/MySQLManager.cs8
-rw-r--r--OpenSim/Grid/UserServer/UserManager.cs2
2 files changed, 7 insertions, 3 deletions
diff --git a/OpenSim/Framework/Data.MySQL/MySQLManager.cs b/OpenSim/Framework/Data.MySQL/MySQLManager.cs
index 88365a3..7ad10fb 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLManager.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLManager.cs
@@ -193,6 +193,8 @@ namespace OpenSim.Framework.Data.MySQL
193 retval.serverIP = (string)reader["serverIP"]; 193 retval.serverIP = (string)reader["serverIP"];
194 retval.serverPort = (uint)reader["serverPort"]; 194 retval.serverPort = (uint)reader["serverPort"];
195 retval.serverURI = (string)reader["serverURI"]; 195 retval.serverURI = (string)reader["serverURI"];
196 retval.httpPort = Convert.ToUInt32(reader["serverHttpPort"].ToString());
197 retval.remotingPort = Convert.ToUInt32(reader["serverRemotingPort"].ToString());
196 198
197 // Location 199 // Location
198 retval.regionLocX = Convert.ToUInt32(reader["locX"].ToString()); 200 retval.regionLocX = Convert.ToUInt32(reader["locX"].ToString());
@@ -543,11 +545,11 @@ namespace OpenSim.Framework.Data.MySQL
543 { 545 {
544 string sql = "REPLACE INTO regions (regionHandle, regionName, uuid, regionRecvKey, regionSecret, regionSendKey, regionDataURI, "; 546 string sql = "REPLACE INTO regions (regionHandle, regionName, uuid, regionRecvKey, regionSecret, regionSendKey, regionDataURI, ";
545 sql += "serverIP, serverPort, serverURI, locX, locY, locZ, eastOverrideHandle, westOverrideHandle, southOverrideHandle, northOverrideHandle, regionAssetURI, regionAssetRecvKey, "; 547 sql += "serverIP, serverPort, serverURI, locX, locY, locZ, eastOverrideHandle, westOverrideHandle, southOverrideHandle, northOverrideHandle, regionAssetURI, regionAssetRecvKey, ";
546 sql += "regionAssetSendKey, regionUserURI, regionUserRecvKey, regionUserSendKey, regionMapTexture) VALUES "; 548 sql += "regionAssetSendKey, regionUserURI, regionUserRecvKey, regionUserSendKey, regionMapTexture, ?serverHttpPort, ?serverRemotingPort) VALUES ";
547 549
548 sql += "(?regionHandle, ?regionName, ?uuid, ?regionRecvKey, ?regionSecret, ?regionSendKey, ?regionDataURI, "; 550 sql += "(?regionHandle, ?regionName, ?uuid, ?regionRecvKey, ?regionSecret, ?regionSendKey, ?regionDataURI, ";
549 sql += "?serverIP, ?serverPort, ?serverURI, ?locX, ?locY, ?locZ, ?eastOverrideHandle, ?westOverrideHandle, ?southOverrideHandle, ?northOverrideHandle, ?regionAssetURI, ?regionAssetRecvKey, "; 551 sql += "?serverIP, ?serverPort, ?serverURI, ?locX, ?locY, ?locZ, ?eastOverrideHandle, ?westOverrideHandle, ?southOverrideHandle, ?northOverrideHandle, ?regionAssetURI, ?regionAssetRecvKey, ";
550 sql += "?regionAssetSendKey, ?regionUserURI, ?regionUserRecvKey, ?regionUserSendKey, ?regionMapTexture);"; 552 sql += "?regionAssetSendKey, ?regionUserURI, ?regionUserRecvKey, ?regionUserSendKey, ?regionMapTexture, ?serverHttpPort, ?serverRemotingPort);";
551 553
552 Dictionary<string, string> parameters = new Dictionary<string, string>(); 554 Dictionary<string, string> parameters = new Dictionary<string, string>();
553 555
@@ -575,6 +577,8 @@ namespace OpenSim.Framework.Data.MySQL
575 parameters["?regionUserRecvKey"] = regiondata.regionUserRecvKey.ToString(); 577 parameters["?regionUserRecvKey"] = regiondata.regionUserRecvKey.ToString();
576 parameters["?regionUserSendKey"] = regiondata.regionUserSendKey.ToString(); 578 parameters["?regionUserSendKey"] = regiondata.regionUserSendKey.ToString();
577 parameters["?regionMapTexture"] = regiondata.regionMapTextureID.ToStringHyphenated(); 579 parameters["?regionMapTexture"] = regiondata.regionMapTextureID.ToStringHyphenated();
580 parameters["?serverHttpPort"] = regiondata.httpPort.ToString();
581 parameters["?serverRemotingPort"] = regiondata.remotingPort.ToString();
578 582
579 bool returnval = false; 583 bool returnval = false;
580 584
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs
index 04bf64a..6fae0a8 100644
--- a/OpenSim/Grid/UserServer/UserManager.cs
+++ b/OpenSim/Grid/UserServer/UserManager.cs
@@ -85,7 +85,7 @@ namespace OpenSim.Grid.UserServer
85 theUser.currentAgent.currentRegion = SimInfo.UUID; 85 theUser.currentAgent.currentRegion = SimInfo.UUID;
86 theUser.currentAgent.currentHandle = SimInfo.regionHandle; 86 theUser.currentAgent.currentHandle = SimInfo.regionHandle;
87 87
88 System.Console.WriteLine("sending reply"); 88 System.Console.WriteLine("Informing region --> " + SimInfo.httpServerURI);
89 // Send 89 // Send
90 XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams); 90 XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams);
91 XmlRpcResponse GridResp = GridReq.Send(SimInfo.httpServerURI, 3000); 91 XmlRpcResponse GridResp = GridReq.Send(SimInfo.httpServerURI, 3000);