diff options
author | Jeff Ames | 2008-09-09 01:26:48 +0000 |
---|---|---|
committer | Jeff Ames | 2008-09-09 01:26:48 +0000 |
commit | fae34bb10cfa10702faf5c19d8c8517faa018cb5 (patch) | |
tree | 2001f24703b010957254dbb49ef5e222ff30b84d /OpenSim/Data | |
parent | Fix state xxx within state xxx itself triggering a state "change" to (diff) | |
download | opensim-SC_OLD-fae34bb10cfa10702faf5c19d8c8517faa018cb5.zip opensim-SC_OLD-fae34bb10cfa10702faf5c19d8c8517faa018cb5.tar.gz opensim-SC_OLD-fae34bb10cfa10702faf5c19d8c8517faa018cb5.tar.bz2 opensim-SC_OLD-fae34bb10cfa10702faf5c19d8c8517faa018cb5.tar.xz |
Update svn properties, formatting cleanup.
Diffstat (limited to 'OpenSim/Data')
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLRegionData.cs | 4 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/MySQLEstateData.cs | 2 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/MySQLUserData.cs | 2 | ||||
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteEstateData.cs | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLRegionData.cs b/OpenSim/Data/MSSQL/MSSQLRegionData.cs index d267e41..ff9d860 100644 --- a/OpenSim/Data/MSSQL/MSSQLRegionData.cs +++ b/OpenSim/Data/MSSQL/MSSQLRegionData.cs | |||
@@ -644,7 +644,7 @@ VALUES | |||
644 | using (AutoClosingSqlCommand cmd = _Database.Query(sql)) | 644 | using (AutoClosingSqlCommand cmd = _Database.Query(sql)) |
645 | { | 645 | { |
646 | cmd.Parameters.Add(_Database.CreateParameter("@regionUUID", regionUUID.ToString())); | 646 | cmd.Parameters.Add(_Database.CreateParameter("@regionUUID", regionUUID.ToString())); |
647 | using(SqlDataReader reader = cmd.ExecuteReader()) | 647 | using (SqlDataReader reader = cmd.ExecuteReader()) |
648 | { | 648 | { |
649 | if (reader.Read()) | 649 | if (reader.Read()) |
650 | { | 650 | { |
@@ -1519,7 +1519,7 @@ VALUES | |||
1519 | 1519 | ||
1520 | dataAdapter.InsertCommand = commandBuilder.GetInsertCommand(true); | 1520 | dataAdapter.InsertCommand = commandBuilder.GetInsertCommand(true); |
1521 | dataAdapter.UpdateCommand = commandBuilder.GetUpdateCommand(true); | 1521 | dataAdapter.UpdateCommand = commandBuilder.GetUpdateCommand(true); |
1522 | dataAdapter.DeleteCommand = commandBuilder.GetDeleteCommand(true); | 1522 | dataAdapter.DeleteCommand = commandBuilder.GetDeleteCommand(true); |
1523 | } | 1523 | } |
1524 | #endregion | 1524 | #endregion |
1525 | } | 1525 | } |
diff --git a/OpenSim/Data/MySQL/MySQLEstateData.cs b/OpenSim/Data/MySQL/MySQLEstateData.cs index 8eddec6..57151b3 100644 --- a/OpenSim/Data/MySQL/MySQLEstateData.cs +++ b/OpenSim/Data/MySQL/MySQLEstateData.cs | |||
@@ -185,7 +185,7 @@ namespace OpenSim.Data.MySQL | |||
185 | else | 185 | else |
186 | m_FieldMap[name].SetValue(es, false); | 186 | m_FieldMap[name].SetValue(es, false); |
187 | } | 187 | } |
188 | else if(m_FieldMap[name].GetValue(es) is OpenMetaverse.UUID) | 188 | else if (m_FieldMap[name].GetValue(es) is OpenMetaverse.UUID) |
189 | { | 189 | { |
190 | UUID uuid = UUID.Zero; | 190 | UUID uuid = UUID.Zero; |
191 | 191 | ||
diff --git a/OpenSim/Data/MySQL/MySQLUserData.cs b/OpenSim/Data/MySQL/MySQLUserData.cs index 42983b1..81acbfb 100644 --- a/OpenSim/Data/MySQL/MySQLUserData.cs +++ b/OpenSim/Data/MySQL/MySQLUserData.cs | |||
@@ -79,7 +79,7 @@ namespace OpenSim.Data.MySQL | |||
79 | m_lastConnect++; | 79 | m_lastConnect++; |
80 | 80 | ||
81 | // Overflow protection | 81 | // Overflow protection |
82 | if(m_lastConnect == int.MaxValue) | 82 | if (m_lastConnect == int.MaxValue) |
83 | m_lastConnect = 0; | 83 | m_lastConnect = 0; |
84 | 84 | ||
85 | MySQLSuperManager x = m_dbconnections[m_lastConnect%m_maxConnections]; | 85 | MySQLSuperManager x = m_dbconnections[m_lastConnect%m_maxConnections]; |
diff --git a/OpenSim/Data/SQLite/SQLiteEstateData.cs b/OpenSim/Data/SQLite/SQLiteEstateData.cs index 1245caa..f95932d 100644 --- a/OpenSim/Data/SQLite/SQLiteEstateData.cs +++ b/OpenSim/Data/SQLite/SQLiteEstateData.cs | |||
@@ -109,7 +109,7 @@ namespace OpenSim.Data.SQLite | |||
109 | else | 109 | else |
110 | m_FieldMap[name].SetValue(es, false); | 110 | m_FieldMap[name].SetValue(es, false); |
111 | } | 111 | } |
112 | else if(m_FieldMap[name].GetValue(es) is OpenMetaverse.UUID) | 112 | else if (m_FieldMap[name].GetValue(es) is OpenMetaverse.UUID) |
113 | { | 113 | { |
114 | UUID uuid = UUID.Zero; | 114 | UUID uuid = UUID.Zero; |
115 | 115 | ||