diff options
author | Melanie Thielker | 2008-11-26 07:34:38 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-11-26 07:34:38 +0000 |
commit | 3efdccbb12fc2d5339870ade39e1b1d54da4fe9b (patch) | |
tree | 5fd5d0e9c802da79aed0579718211507945699cc /OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |
parent | Next step of the PresenceModule. Still not complete; local optimizations and the (diff) | |
download | opensim-SC-3efdccbb12fc2d5339870ade39e1b1d54da4fe9b.zip opensim-SC-3efdccbb12fc2d5339870ade39e1b1d54da4fe9b.tar.gz opensim-SC-3efdccbb12fc2d5339870ade39e1b1d54da4fe9b.tar.bz2 opensim-SC-3efdccbb12fc2d5339870ade39e1b1d54da4fe9b.tar.xz |
Committing the LCO database layer. Native MySQL, no ADO. New reconnect
mechanism to prevent prim loss. Preserve link order on sim restart
and drag copy. Fix drag-copied prims' inventories. Fix persistence
of child prim inventories.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index e97b99f..5b494d3 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |||
@@ -1263,10 +1263,18 @@ if (m_shape != null) { | |||
1263 | dupe._category = _category; | 1263 | dupe._category = _category; |
1264 | dupe.m_rezzed = m_rezzed; | 1264 | dupe.m_rezzed = m_rezzed; |
1265 | 1265 | ||
1266 | dupe.m_inventory.Items = (TaskInventoryDictionary)dupe.m_inventory.Items.Clone(); | 1266 | dupe.m_inventory = new SceneObjectPartInventory(dupe); |
1267 | dupe.m_inventory.Items = (TaskInventoryDictionary)m_inventory.Items.Clone(); | ||
1267 | 1268 | ||
1268 | if (userExposed) | 1269 | if (userExposed) |
1270 | { | ||
1269 | dupe.ResetIDs(linkNum); | 1271 | dupe.ResetIDs(linkNum); |
1272 | dupe.m_inventory.HasInventoryChanged = true; | ||
1273 | } | ||
1274 | else | ||
1275 | { | ||
1276 | dupe.m_inventory.HasInventoryChanged = m_inventory.HasInventoryChanged; | ||
1277 | } | ||
1270 | 1278 | ||
1271 | // Move afterwards ResetIDs as it clears the localID | 1279 | // Move afterwards ResetIDs as it clears the localID |
1272 | dupe.LocalId = localID; | 1280 | dupe.LocalId = localID; |