diff options
author | Justin Clarke Casey | 2009-01-19 15:16:17 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-01-19 15:16:17 +0000 |
commit | 0828c28501cfb14100d1270924ec77a8877ba94e (patch) | |
tree | 5a18964ac0f48b897aef59b43890b33542a7f4bf /OpenSim/Data/SQLite/SQLiteRegionData.cs | |
parent | No longer append a "texture" parameter on texture asset requests. The (diff) | |
download | opensim-SC-0828c28501cfb14100d1270924ec77a8877ba94e.zip opensim-SC-0828c28501cfb14100d1270924ec77a8877ba94e.tar.gz opensim-SC-0828c28501cfb14100d1270924ec77a8877ba94e.tar.bz2 opensim-SC-0828c28501cfb14100d1270924ec77a8877ba94e.tar.xz |
* Remove unused prims.ParentID field from SQLite and MySQL
* Since this is a db change, as always I strongly recommend that you backup your database before updating to this revision
* Haven't touched MSSQL in case I get it wrong - looking for some kind soul to take care of this.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteRegionData.cs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs index 7f929a8..fce98a2 100644 --- a/OpenSim/Data/SQLite/SQLiteRegionData.cs +++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs | |||
@@ -404,13 +404,12 @@ namespace OpenSim.Data.SQLite | |||
404 | DataTable shapes = ds.Tables["primshapes"]; | 404 | DataTable shapes = ds.Tables["primshapes"]; |
405 | 405 | ||
406 | string byRegion = "RegionUUID = '" + Util.ToRawUuidString(regionUUID) + "'"; | 406 | string byRegion = "RegionUUID = '" + Util.ToRawUuidString(regionUUID) + "'"; |
407 | string orderByParent = "ParentID ASC"; | ||
408 | 407 | ||
409 | lock (ds) | 408 | lock (ds) |
410 | { | 409 | { |
411 | DataRow[] primsForRegion = prims.Select(byRegion, orderByParent); | 410 | DataRow[] primsForRegion = prims.Select(byRegion); |
412 | m_log.Info("[REGION DB]: " + | 411 | m_log.Info("[REGION DB]: Loaded " + primsForRegion.Length + " prims for region: " + regionUUID); |
413 | "Loaded " + primsForRegion.Length + " prims for region: " + regionUUID); | 412 | |
414 | // First, create all groups | 413 | // First, create all groups |
415 | foreach (DataRow primRow in primsForRegion) | 414 | foreach (DataRow primRow in primsForRegion) |
416 | { | 415 | { |