diff options
hooked up sdague new sqlite asset database provider to the old asset system. So we can still use sqlite for assets while we wait for the rest of the new asset system to be wrote.
Needs more testing, so if it causes problems will have to swap back to db4o.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index 9e207c8..2122a4f 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |||
@@ -12,6 +12,7 @@ using OpenSim.Framework.Types; | |||
12 | using OpenSim.Region.Environment.Scenes.Scripting; | 12 | using OpenSim.Region.Environment.Scenes.Scripting; |
13 | using OpenSim.Framework.Utilities; | 13 | using OpenSim.Framework.Utilities; |
14 | using OpenSim.Region.Physics.Manager; | 14 | using OpenSim.Region.Physics.Manager; |
15 | using OpenSim.Region.Environment.Interfaces; | ||
15 | 16 | ||
16 | namespace OpenSim.Region.Environment.Scenes | 17 | namespace OpenSim.Region.Environment.Scenes |
17 | { | 18 | { |
@@ -494,7 +495,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
494 | return false; | 495 | return false; |
495 | } | 496 | } |
496 | 497 | ||
497 | public string RequestInventoryFile(ModuleAPIMethod2<bool, string, byte[]> addXferFile) | 498 | public string RequestInventoryFile(IXfer xferManager) |
498 | { | 499 | { |
499 | byte[] fileData = new byte[0]; | 500 | byte[] fileData = new byte[0]; |
500 | InventoryStringBuilder invString = new InventoryStringBuilder(m_folderID, this.UUID); | 501 | InventoryStringBuilder invString = new InventoryStringBuilder(m_folderID, this.UUID); |
@@ -528,7 +529,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
528 | fileData = Helpers.StringToField(invString.BuildString); | 529 | fileData = Helpers.StringToField(invString.BuildString); |
529 | if (fileData.Length > 2) | 530 | if (fileData.Length > 2) |
530 | { | 531 | { |
531 | addXferFile(m_inventoryFileName, fileData); | 532 | xferManager.AddNewFile(m_inventoryFileName, fileData); |
532 | } | 533 | } |
533 | return ""; | 534 | return ""; |
534 | } | 535 | } |