diff options
| author | Melanie | 2009-10-01 14:08:15 +0100 |
|---|---|---|
| committer | Melanie | 2009-10-01 14:08:15 +0100 |
| commit | 41ff39414bc70ef645e2180693792c83d61a7539 (patch) | |
| tree | dc711428d4c8fed07791263ff4dfea142d54e4e7 /OpenSim/Data/SQLite | |
| parent | Merge branch 'vehicles' of ssh://opensim@tor.k-grid.com/home/opensim/opensim ... (diff) | |
| parent | - adding new LandDataSerializer testcase to "test-xml" target as well (diff) | |
| download | opensim-SC-41ff39414bc70ef645e2180693792c83d61a7539.zip opensim-SC-41ff39414bc70ef645e2180693792c83d61a7539.tar.gz opensim-SC-41ff39414bc70ef645e2180693792c83d61a7539.tar.bz2 opensim-SC-41ff39414bc70ef645e2180693792c83d61a7539.tar.xz | |
Merge branch 'master' into vehicles
Diffstat (limited to 'OpenSim/Data/SQLite')
| -rw-r--r-- | OpenSim/Data/SQLite/SQLiteRegionData.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs index ea076fe..d22a3ec 100644 --- a/OpenSim/Data/SQLite/SQLiteRegionData.cs +++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs | |||
| @@ -496,7 +496,7 @@ namespace OpenSim.Data.SQLite | |||
| 496 | { | 496 | { |
| 497 | //m_log.DebugFormat("[DATASTORE]: Loading inventory for {0}, {1}", prim.Name, prim.UUID); | 497 | //m_log.DebugFormat("[DATASTORE]: Loading inventory for {0}, {1}", prim.Name, prim.UUID); |
| 498 | 498 | ||
| 499 | DataTable dbItems = ds.Tables["primitems"]; | 499 | DataTable dbItems = ds.Tables["primitems"]; |
| 500 | String sql = String.Format("primID = '{0}'", prim.UUID.ToString()); | 500 | String sql = String.Format("primID = '{0}'", prim.UUID.ToString()); |
| 501 | DataRow[] dbItemRows = dbItems.Select(sql); | 501 | DataRow[] dbItemRows = dbItems.Select(sql); |
| 502 | IList<TaskInventoryItem> inventory = new List<TaskInventoryItem>(); | 502 | IList<TaskInventoryItem> inventory = new List<TaskInventoryItem>(); |