diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLDataStore.cs | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLDataStore.cs b/OpenSim/Data/MSSQL/MSSQLDataStore.cs index 08217dc..8bb15c8 100644 --- a/OpenSim/Data/MSSQL/MSSQLDataStore.cs +++ b/OpenSim/Data/MSSQL/MSSQLDataStore.cs | |||
@@ -140,7 +140,7 @@ namespace OpenSim.Data.MSSQL | |||
140 | m_landAccessListTable = createLandAccessListTable(); | 140 | m_landAccessListTable = createLandAccessListTable(); |
141 | m_dataSet.Tables.Add(m_landAccessListTable); | 141 | m_dataSet.Tables.Add(m_landAccessListTable); |
142 | setupLandAccessCommands(m_landAccessListDataAdapter, m_connection); | 142 | setupLandAccessCommands(m_landAccessListDataAdapter, m_connection); |
143 | m_landAccessListDataAdapter.Fill(m_landAccessListTable); | 143 | m_landAccessListDataAdapter.Fill(m_landAccessListTable); |
144 | } | 144 | } |
145 | } | 145 | } |
146 | 146 | ||
@@ -172,7 +172,7 @@ namespace OpenSim.Data.MSSQL | |||
172 | public void RemoveObject(LLUUID obj, LLUUID regionUUID) | 172 | public void RemoveObject(LLUUID obj, LLUUID regionUUID) |
173 | { | 173 | { |
174 | // Instance.RemoveObject(obj, regionUUID); | 174 | // Instance.RemoveObject(obj, regionUUID); |
175 | 175 | ||
176 | m_log.InfoFormat("[REGION DB]: Removing obj: {0} from region: {1}", obj.UUID, regionUUID); | 176 | m_log.InfoFormat("[REGION DB]: Removing obj: {0} from region: {1}", obj.UUID, regionUUID); |
177 | 177 | ||
178 | DataTable prims = m_primTable; | 178 | DataTable prims = m_primTable; |
@@ -222,7 +222,7 @@ namespace OpenSim.Data.MSSQL | |||
222 | 222 | ||
223 | /// <summary> | 223 | /// <summary> |
224 | /// Load persisted objects from region storage. | 224 | /// Load persisted objects from region storage. |
225 | /// </summary> | 225 | /// </summary> |
226 | public List<SceneObjectGroup> LoadObjects(LLUUID regionUUID) | 226 | public List<SceneObjectGroup> LoadObjects(LLUUID regionUUID) |
227 | { | 227 | { |
228 | // return Instance.LoadObjects(regionUUID); | 228 | // return Instance.LoadObjects(regionUUID); |
@@ -328,12 +328,12 @@ namespace OpenSim.Data.MSSQL | |||
328 | TaskInventoryItem item = buildItem(row); | 328 | TaskInventoryItem item = buildItem(row); |
329 | inventory.Add(item); | 329 | inventory.Add(item); |
330 | 330 | ||
331 | //m_log.DebugFormat("[DATASTORE]: Restored item {0}, {1}", item.Name, item.ItemID); | 331 | //m_log.DebugFormat("[DATASTORE]: Restored item {0}, {1}", item.Name, item.ItemID); |
332 | } | 332 | } |
333 | 333 | ||
334 | prim.RestoreInventoryItems(inventory); | 334 | prim.RestoreInventoryItems(inventory); |
335 | 335 | ||
336 | // XXX A nasty little hack to recover the folder id for the prim (which is currently stored in | 336 | // XXX A nasty little hack to recover the folder id for the prim (which is currently stored in |
337 | // every item). This data should really be stored in the prim table itself. | 337 | // every item). This data should really be stored in the prim table itself. |
338 | if (dbItemRows.Length > 0) | 338 | if (dbItemRows.Length > 0) |
339 | { | 339 | { |
@@ -527,7 +527,7 @@ namespace OpenSim.Data.MSSQL | |||
527 | /*********************************************************************** | 527 | /*********************************************************************** |
528 | * | 528 | * |
529 | * Database Definition Functions | 529 | * Database Definition Functions |
530 | * | 530 | * |
531 | * This should be db agnostic as we define them in ADO.NET terms | 531 | * This should be db agnostic as we define them in ADO.NET terms |
532 | * | 532 | * |
533 | **********************************************************************/ | 533 | **********************************************************************/ |
@@ -742,7 +742,7 @@ namespace OpenSim.Data.MSSQL | |||
742 | } | 742 | } |
743 | 743 | ||
744 | /*********************************************************************** | 744 | /*********************************************************************** |
745 | * | 745 | * |
746 | * Convert between ADO.NET <=> OpenSim Objects | 746 | * Convert between ADO.NET <=> OpenSim Objects |
747 | * | 747 | * |
748 | * These should be database independant | 748 | * These should be database independant |
@@ -1198,7 +1198,7 @@ namespace OpenSim.Data.MSSQL | |||
1198 | 1198 | ||
1199 | m_log.InfoFormat("[REGION DB]: Persisting Prim Inventory with prim ID {0}", primID); | 1199 | m_log.InfoFormat("[REGION DB]: Persisting Prim Inventory with prim ID {0}", primID); |
1200 | 1200 | ||
1201 | // For now, we're just going to crudely remove all the previous inventory items | 1201 | // For now, we're just going to crudely remove all the previous inventory items |
1202 | // no matter whether they have changed or not, and replace them with the current set. | 1202 | // no matter whether they have changed or not, and replace them with the current set. |
1203 | lock (m_dataSet) | 1203 | lock (m_dataSet) |
1204 | { | 1204 | { |
@@ -1209,7 +1209,7 @@ namespace OpenSim.Data.MSSQL | |||
1209 | { | 1209 | { |
1210 | // m_log.InfoFormat( | 1210 | // m_log.InfoFormat( |
1211 | // "[REGION DB]: " + | 1211 | // "[REGION DB]: " + |
1212 | // "Adding item {0}, {1} to prim ID {2}", | 1212 | // "Adding item {0}, {1} to prim ID {2}", |
1213 | // newItem.Name, newItem.ItemID, newItem.ParentPartID); | 1213 | // newItem.Name, newItem.ItemID, newItem.ParentPartID); |
1214 | 1214 | ||
1215 | DataRow newItemRow = m_itemsTable.NewRow(); | 1215 | DataRow newItemRow = m_itemsTable.NewRow(); |
@@ -1282,7 +1282,7 @@ namespace OpenSim.Data.MSSQL | |||
1282 | sql += subsql; | 1282 | sql += subsql; |
1283 | sql += " where " + pk; | 1283 | sql += " where " + pk; |
1284 | SqlCommand cmd = new SqlCommand(sql); | 1284 | SqlCommand cmd = new SqlCommand(sql); |
1285 | 1285 | ||
1286 | // this provides the binding for all our parameters, so | 1286 | // this provides the binding for all our parameters, so |
1287 | // much less code than it used to be | 1287 | // much less code than it used to be |
1288 | 1288 | ||
@@ -1329,7 +1329,7 @@ namespace OpenSim.Data.MSSQL | |||
1329 | /// This is a convenience function that collapses 5 repetitive | 1329 | /// This is a convenience function that collapses 5 repetitive |
1330 | /// lines for defining SqlParameters to 2 parameters: | 1330 | /// lines for defining SqlParameters to 2 parameters: |
1331 | /// column name and database type. | 1331 | /// column name and database type. |
1332 | /// | 1332 | /// |
1333 | /// It assumes certain conventions like :param as the param | 1333 | /// It assumes certain conventions like :param as the param |
1334 | /// name to replace in parametrized queries, and that source | 1334 | /// name to replace in parametrized queries, and that source |
1335 | /// version is always current version, both of which are fine | 1335 | /// version is always current version, both of which are fine |
@@ -1424,7 +1424,7 @@ namespace OpenSim.Data.MSSQL | |||
1424 | SqlCommand tcmd = new SqlCommand(createTerrain, conn); | 1424 | SqlCommand tcmd = new SqlCommand(createTerrain, conn); |
1425 | SqlCommand lcmd = new SqlCommand(createLand, conn); | 1425 | SqlCommand lcmd = new SqlCommand(createLand, conn); |
1426 | SqlCommand lalcmd = new SqlCommand(createLandAccessList, conn); | 1426 | SqlCommand lalcmd = new SqlCommand(createLandAccessList, conn); |
1427 | 1427 | ||
1428 | conn.Open(); | 1428 | conn.Open(); |
1429 | try | 1429 | try |
1430 | { | 1430 | { |
@@ -1604,6 +1604,6 @@ namespace OpenSim.Data.MSSQL | |||
1604 | { | 1604 | { |
1605 | return DbType.String; | 1605 | return DbType.String; |
1606 | } | 1606 | } |
1607 | } | 1607 | } |
1608 | } | 1608 | } |
1609 | } | 1609 | } |