diff options
author | Justin Clarke Casey | 2008-07-13 00:18:29 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-07-13 00:18:29 +0000 |
commit | eb63b9bbc10ee9d794c273dc01111de8ce8c8a0c (patch) | |
tree | e744381547466429d3001955b62dd4f2e28c7983 /OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs | |
parent | * Elminate most of the debugging log output from the archive commands (diff) | |
download | opensim-SC_OLD-eb63b9bbc10ee9d794c273dc01111de8ce8c8a0c.zip opensim-SC_OLD-eb63b9bbc10ee9d794c273dc01111de8ce8c8a0c.tar.gz opensim-SC_OLD-eb63b9bbc10ee9d794c273dc01111de8ce8c8a0c.tar.bz2 opensim-SC_OLD-eb63b9bbc10ee9d794c273dc01111de8ce8c8a0c.tar.xz |
* Actually persist restored archives to the database - wasn't actually doing this before (doh)
* Not quite perfect yet
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs index 005d872..d407392 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs | |||
@@ -58,7 +58,15 @@ namespace OpenSim.Region.Environment.Scenes | |||
58 | /// <summary> | 58 | /// <summary> |
59 | /// Tracks whether inventory has changed since the last persistent backup | 59 | /// Tracks whether inventory has changed since the last persistent backup |
60 | /// </summary> | 60 | /// </summary> |
61 | private bool HasInventoryChanged; | 61 | protected bool HasInventoryChanged; |
62 | |||
63 | /// <summary> | ||
64 | /// Force the task inventory of this prim to persist at the next update sweep | ||
65 | /// </summary> | ||
66 | public void ForceInventoryPersistence() | ||
67 | { | ||
68 | HasInventoryChanged = true; | ||
69 | } | ||
62 | 70 | ||
63 | /// <summary> | 71 | /// <summary> |
64 | /// Reset LLUUIDs for all the items in the prim's inventory. This involves either generating | 72 | /// Reset LLUUIDs for all the items in the prim's inventory. This involves either generating |
@@ -72,9 +80,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
72 | lock (TaskInventory) | 80 | lock (TaskInventory) |
73 | { | 81 | { |
74 | if (0 == TaskInventory.Count) | 82 | if (0 == TaskInventory.Count) |
75 | { | ||
76 | return; | 83 | return; |
77 | } | ||
78 | 84 | ||
79 | HasInventoryChanged = true; | 85 | HasInventoryChanged = true; |
80 | ParentGroup.HasGroupChanged = true; | 86 | ParentGroup.HasGroupChanged = true; |
@@ -597,7 +603,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
597 | public void ProcessInventoryBackup(IRegionDataStore datastore) | 603 | public void ProcessInventoryBackup(IRegionDataStore datastore) |
598 | { | 604 | { |
599 | if (HasInventoryChanged) | 605 | if (HasInventoryChanged) |
600 | { | 606 | { |
601 | lock (TaskInventory) | 607 | lock (TaskInventory) |
602 | { | 608 | { |
603 | datastore.StorePrimInventory(UUID, TaskInventory.Values); | 609 | datastore.StorePrimInventory(UUID, TaskInventory.Values); |