diff options
author | Sean Dague | 2008-10-30 12:56:10 +0000 |
---|---|---|
committer | Sean Dague | 2008-10-30 12:56:10 +0000 |
commit | 9e353d5713e116e0ea1243df7db085bfba08d6e9 (patch) | |
tree | 2e414d5f9010987ca3c67d04929cb00205cb6bd8 /OpenSim/Data/MySQL | |
parent | Mid-work, trying to fix region part insertion and retrieval (diff) | |
download | opensim-SC-9e353d5713e116e0ea1243df7db085bfba08d6e9.zip opensim-SC-9e353d5713e116e0ea1243df7db085bfba08d6e9.tar.gz opensim-SC-9e353d5713e116e0ea1243df7db085bfba08d6e9.tar.bz2 opensim-SC-9e353d5713e116e0ea1243df7db085bfba08d6e9.tar.xz |
- Includes consistency test for new and updated objects, as
some fixes in MySQL and SQLite
From: Arthur Rodrigo S Valadares <arthursv@linux.vnet.ibm.com>
Diffstat (limited to 'OpenSim/Data/MySQL')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLRegionData.cs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Data/MySQL/MySQLRegionData.cs b/OpenSim/Data/MySQL/MySQLRegionData.cs index fb08049..ac8165c 100644 --- a/OpenSim/Data/MySQL/MySQLRegionData.cs +++ b/OpenSim/Data/MySQL/MySQLRegionData.cs | |||
@@ -425,8 +425,8 @@ namespace OpenSim.Data.MySQL | |||
425 | group.RootPart = prim; | 425 | group.RootPart = prim; |
426 | createdObjects.Add(group.UUID, group); | 426 | createdObjects.Add(group.UUID, group); |
427 | retvals.Add(group); | 427 | retvals.Add(group); |
428 | LoadItems(prim); | ||
428 | } | 429 | } |
429 | LoadItems(prim); | ||
430 | } | 430 | } |
431 | catch (Exception e) | 431 | catch (Exception e) |
432 | { | 432 | { |
@@ -463,8 +463,8 @@ namespace OpenSim.Data.MySQL | |||
463 | prim.Shape = PrimitiveBaseShape.Default; | 463 | prim.Shape = PrimitiveBaseShape.Default; |
464 | } | 464 | } |
465 | createdObjects[new UUID(objID)].AddPart(prim); | 465 | createdObjects[new UUID(objID)].AddPart(prim); |
466 | LoadItems(prim); | ||
466 | } | 467 | } |
467 | LoadItems(prim); | ||
468 | } | 468 | } |
469 | catch (Exception e) | 469 | catch (Exception e) |
470 | { | 470 | { |
@@ -495,7 +495,6 @@ namespace OpenSim.Data.MySQL | |||
495 | 495 | ||
496 | String sql = String.Format("primID = '{0}'", prim.UUID.ToString()); | 496 | String sql = String.Format("primID = '{0}'", prim.UUID.ToString()); |
497 | DataRow[] dbItemRows = dbItems.Select(sql); | 497 | DataRow[] dbItemRows = dbItems.Select(sql); |
498 | Console.WriteLine("dbItemRows MYSQL Length: {0}",dbItemRows.Length); | ||
499 | IList<TaskInventoryItem> inventory = new List<TaskInventoryItem>(); | 498 | IList<TaskInventoryItem> inventory = new List<TaskInventoryItem>(); |
500 | 499 | ||
501 | foreach (DataRow row in dbItemRows) | 500 | foreach (DataRow row in dbItemRows) |