Grid Servers:

* Sugilite grid server now works with older regions properly (using it on deepgrid for testing)
* Sugilite user server still broken with sugilite region server
* Reduced the number of compiler warnings to zero
Region Servers:
* Added debug information to OGS1 Comms to help debug user server connectivity issues.

2 files changed, 6 insertions, 6 deletions

diff --git a/OpenSim/Framework/Data.MySQL/MySQLLogData.cs b/OpenSim/Framework/Data.MySQL/MySQLLogData.cs
index 66f3399..38f9fd3 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLLogData.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLLogData.cs
@@ -70,7 +70,7 @@ namespace OpenSim.Framework.Data.MySQL
             {

                 database.insertLogRow(serverDaemon, target, methodCall, arguments, priority, logMessage);

             }

-            catch (Exception e)

+            catch

             {

                 database.Reconnect();

             }

diff --git a/OpenSim/Framework/Data.MySQL/MySQLManager.cs b/OpenSim/Framework/Data.MySQL/MySQLManager.cs
index ab478ed..88365a3 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLManager.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLManager.cs
@@ -246,12 +246,12 @@ namespace OpenSim.Framework.Data.MySQL
                 retval.gridRecvKey = (string)reader["gridRecvKey"];

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

                 retval.reservationCompany = (string)reader["resCompany"];

-                retval.reservationMaxX = (int)reader["resXMax"];

-                retval.reservationMaxY = (int)reader["resYMax"];

-                retval.reservationMinX = (int)reader["resXMin"];

-                retval.reservationMinY = (int)reader["resYMin"];

+                retval.reservationMaxX = Convert.ToInt32(reader["resXMax"].ToString());

+                retval.reservationMaxY = Convert.ToInt32(reader["resYMax"].ToString());

+                retval.reservationMinX = Convert.ToInt32(reader["resXMin"].ToString());

+                retval.reservationMinY = Convert.ToInt32(reader["resYMin"].ToString());

                 retval.reservationName = (string)reader["resName"];

-                retval.status = (bool)reader["status"];

+                retval.status = Convert.ToInt32(reader["status"].ToString()) == 1;

                 retval.userUUID = new LLUUID((string)reader["userUUID"]);

 

             }