* Upgraded MySQL Connector to support 1222 changes.

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
                 retval.serverIP = (string)reader["serverIP"];

                 retval.serverPort = (uint)reader["serverPort"];

                 retval.serverURI = (string)reader["serverURI"];

+                retval.httpPort = Convert.ToUInt32(reader["serverHttpPort"].ToString());

+                retval.remotingPort = Convert.ToUInt32(reader["serverRemotingPort"].ToString());

 

                 // Location

                 retval.regionLocX = Convert.ToUInt32(reader["locX"].ToString());

@@ -543,11 +545,11 @@ namespace OpenSim.Framework.Data.MySQL
         {

             string sql = "REPLACE INTO regions (regionHandle, regionName, uuid, regionRecvKey, regionSecret, regionSendKey, regionDataURI, ";

             sql += "serverIP, serverPort, serverURI, locX, locY, locZ, eastOverrideHandle, westOverrideHandle, southOverrideHandle, northOverrideHandle, regionAssetURI, regionAssetRecvKey, ";

-            sql += "regionAssetSendKey, regionUserURI, regionUserRecvKey, regionUserSendKey, regionMapTexture) VALUES ";

+            sql += "regionAssetSendKey, regionUserURI, regionUserRecvKey, regionUserSendKey, regionMapTexture, ?serverHttpPort, ?serverRemotingPort) VALUES ";

 

             sql += "(?regionHandle, ?regionName, ?uuid, ?regionRecvKey, ?regionSecret, ?regionSendKey, ?regionDataURI, ";

             sql += "?serverIP, ?serverPort, ?serverURI, ?locX, ?locY, ?locZ, ?eastOverrideHandle, ?westOverrideHandle, ?southOverrideHandle, ?northOverrideHandle, ?regionAssetURI, ?regionAssetRecvKey, ";

-            sql += "?regionAssetSendKey, ?regionUserURI, ?regionUserRecvKey, ?regionUserSendKey, ?regionMapTexture);";

+            sql += "?regionAssetSendKey, ?regionUserURI, ?regionUserRecvKey, ?regionUserSendKey, ?regionMapTexture, ?serverHttpPort, ?serverRemotingPort);";

 

             Dictionary<string, string> parameters = new Dictionary<string, string>();

 

@@ -575,6 +577,8 @@ namespace OpenSim.Framework.Data.MySQL
             parameters["?regionUserRecvKey"] = regiondata.regionUserRecvKey.ToString();

             parameters["?regionUserSendKey"] = regiondata.regionUserSendKey.ToString();

             parameters["?regionMapTexture"] = regiondata.regionMapTextureID.ToStringHyphenated();

+            parameters["?serverHttpPort"] = regiondata.httpPort.ToString();

+            parameters["?serverRemotingPort"] = regiondata.remotingPort.ToString();

 

             bool returnval = false;

 

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
             theUser.currentAgent.currentRegion = SimInfo.UUID;

             theUser.currentAgent.currentHandle = SimInfo.regionHandle;

 

-            System.Console.WriteLine("sending reply");

+            System.Console.WriteLine("Informing region --> " + SimInfo.httpServerURI);

             // Send

             XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams);

             XmlRpcResponse GridResp = GridReq.Send(SimInfo.httpServerURI, 3000);