diff options
author | Sean Dague | 2007-10-01 08:17:43 +0000 |
---|---|---|
committer | Sean Dague | 2007-10-01 08:17:43 +0000 |
commit | 1a10d4828a4f7ca09da7042301dd0dcfd906af8c (patch) | |
tree | 0610690d89a9cfe6634cee45ce99ed37fc831eaa /OpenSim/Framework | |
parent | Applied ckrinke's patch for #453. Thanks Charles! :) (diff) | |
download | opensim-SC-1a10d4828a4f7ca09da7042301dd0dcfd906af8c.zip opensim-SC-1a10d4828a4f7ca09da7042301dd0dcfd906af8c.tar.gz opensim-SC-1a10d4828a4f7ca09da7042301dd0dcfd906af8c.tar.bz2 opensim-SC-1a10d4828a4f7ca09da7042301dd0dcfd906af8c.tar.xz |
revert working getInventoryFolder function because this seems
to break multi region environments.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/Data.SQLite/SQLiteInventoryStore.cs | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/OpenSim/Framework/Data.SQLite/SQLiteInventoryStore.cs b/OpenSim/Framework/Data.SQLite/SQLiteInventoryStore.cs index ba6038c..99fa740 100644 --- a/OpenSim/Framework/Data.SQLite/SQLiteInventoryStore.cs +++ b/OpenSim/Framework/Data.SQLite/SQLiteInventoryStore.cs | |||
@@ -275,12 +275,19 @@ namespace OpenSim.Framework.Data.SQLite | |||
275 | /// <returns>A class containing folder information</returns> | 275 | /// <returns>A class containing folder information</returns> |
276 | public InventoryFolderBase getInventoryFolder(LLUUID folder) | 276 | public InventoryFolderBase getInventoryFolder(LLUUID folder) |
277 | { | 277 | { |
278 | DataRow row = ds.Tables["inventoryfolders"].Rows.Find(folder); | 278 | |
279 | if (row != null) { | 279 | // TODO: Deep voodoo here. If you enable this code then |
280 | return buildFolder(row); | 280 | // multi region breaks. No idea why, but I figured it was |
281 | } else { | 281 | // better to leave multi region at this point. It does mean |
282 | return null; | 282 | // that you don't get to see system textures why creating |
283 | } | 283 | // clothes and the like. :( |
284 | |||
285 | // DataRow row = ds.Tables["inventoryfolders"].Rows.Find(folder); | ||
286 | // if (row != null) { | ||
287 | // return buildFolder(row); | ||
288 | // } else { | ||
289 | return null; | ||
290 | // } | ||
284 | } | 291 | } |
285 | 292 | ||
286 | /// <summary> | 293 | /// <summary> |