diff options
author | Adam Frisby | 2007-07-04 07:45:42 +0000 |
---|---|---|
committer | Adam Frisby | 2007-07-04 07:45:42 +0000 |
commit | 827cccb99c39b7dd3ee0ccc3defb9d88e449db52 (patch) | |
tree | 32e07c7b2db0f213844fea6e361093f92cc301bf /OpenSim/Framework | |
parent | * More cleaning - Sugilite now only has build errors for "value is never used... (diff) | |
download | opensim-SC_OLD-827cccb99c39b7dd3ee0ccc3defb9d88e449db52.zip opensim-SC_OLD-827cccb99c39b7dd3ee0ccc3defb9d88e449db52.tar.gz opensim-SC_OLD-827cccb99c39b7dd3ee0ccc3defb9d88e449db52.tar.bz2 opensim-SC_OLD-827cccb99c39b7dd3ee0ccc3defb9d88e449db52.tar.xz |
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.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Data.MySQL/MySQLLogData.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/Data.MySQL/MySQLManager.cs | 10 |
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 | |||
70 | { | 70 | { |
71 | database.insertLogRow(serverDaemon, target, methodCall, arguments, priority, logMessage); | 71 | database.insertLogRow(serverDaemon, target, methodCall, arguments, priority, logMessage); |
72 | } | 72 | } |
73 | catch (Exception e) | 73 | catch |
74 | { | 74 | { |
75 | database.Reconnect(); | 75 | database.Reconnect(); |
76 | } | 76 | } |
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 | |||
246 | retval.gridRecvKey = (string)reader["gridRecvKey"]; | 246 | retval.gridRecvKey = (string)reader["gridRecvKey"]; |
247 | retval.gridSendKey = (string)reader["gridSendKey"]; | 247 | retval.gridSendKey = (string)reader["gridSendKey"]; |
248 | retval.reservationCompany = (string)reader["resCompany"]; | 248 | retval.reservationCompany = (string)reader["resCompany"]; |
249 | retval.reservationMaxX = (int)reader["resXMax"]; | 249 | retval.reservationMaxX = Convert.ToInt32(reader["resXMax"].ToString()); |
250 | retval.reservationMaxY = (int)reader["resYMax"]; | 250 | retval.reservationMaxY = Convert.ToInt32(reader["resYMax"].ToString()); |
251 | retval.reservationMinX = (int)reader["resXMin"]; | 251 | retval.reservationMinX = Convert.ToInt32(reader["resXMin"].ToString()); |
252 | retval.reservationMinY = (int)reader["resYMin"]; | 252 | retval.reservationMinY = Convert.ToInt32(reader["resYMin"].ToString()); |
253 | retval.reservationName = (string)reader["resName"]; | 253 | retval.reservationName = (string)reader["resName"]; |
254 | retval.status = (bool)reader["status"]; | 254 | retval.status = Convert.ToInt32(reader["status"].ToString()) == 1; |
255 | retval.userUUID = new LLUUID((string)reader["userUUID"]); | 255 | retval.userUUID = new LLUUID((string)reader["userUUID"]); |
256 | 256 | ||
257 | } | 257 | } |