diff options
| author | Sean Dague | 2008-09-09 18:44:54 +0000 |
|---|---|---|
| committer | Sean Dague | 2008-09-09 18:44:54 +0000 |
| commit | 66dad4ab03893ad128c28f54803492314398da13 (patch) | |
| tree | 44d8237732bdab172204500f2d81b4296628cd58 | |
| parent | twiddle testing to kick of another build (diff) | |
| download | opensim-SC-66dad4ab03893ad128c28f54803492314398da13.zip opensim-SC-66dad4ab03893ad128c28f54803492314398da13.tar.gz opensim-SC-66dad4ab03893ad128c28f54803492314398da13.tar.bz2 opensim-SC-66dad4ab03893ad128c28f54803492314398da13.tar.xz | |
hopefully fix embedded inventory for sqlite
| -rw-r--r-- | OpenSim/Data/SQLite/SQLiteRegionData.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs index cfb2023..b6d1abe 100644 --- a/OpenSim/Data/SQLite/SQLiteRegionData.cs +++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs | |||
| @@ -354,8 +354,8 @@ namespace OpenSim.Data.SQLite | |||
| 354 | createdObjects[new UUID(objID)].AddPart(prim); | 354 | createdObjects[new UUID(objID)].AddPart(prim); |
| 355 | } | 355 | } |
| 356 | 356 | ||
| 357 | LoadItems(prim); | 357 | LoadItems(prim); |
| 358 | } | 358 | } |
| 359 | catch (Exception e) | 359 | catch (Exception e) |
| 360 | { | 360 | { |
| 361 | m_log.Error("[REGION DB]: Failed create prim object, exception and data follows"); | 361 | m_log.Error("[REGION DB]: Failed create prim object, exception and data follows"); |
| @@ -380,7 +380,7 @@ namespace OpenSim.Data.SQLite | |||
| 380 | 380 | ||
| 381 | DataTable dbItems = ds.Tables["primitems"]; | 381 | DataTable dbItems = ds.Tables["primitems"]; |
| 382 | 382 | ||
| 383 | String sql = String.Format("primID = '{0}'", prim.ToString()); | 383 | String sql = String.Format("primID = '{0}'", prim.UUID.ToString()); |
| 384 | DataRow[] dbItemRows = dbItems.Select(sql); | 384 | DataRow[] dbItemRows = dbItems.Select(sql); |
| 385 | 385 | ||
| 386 | IList<TaskInventoryItem> inventory = new List<TaskInventoryItem>(); | 386 | IList<TaskInventoryItem> inventory = new List<TaskInventoryItem>(); |