OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'bigmerge' of ssh://melanie@3dhosting.de/var/git/careminster into bigmerge

avinationmerge
Melanie 2011-11-06 20:45:07 +00:00
parent 51bad0f8ae c9179be1ed
commit 84a61cd00b
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
View File

@ -109,7 +109,7 @@ namespace OpenSim.Region.Framework.Scenes
foreach (SceneObjectGroup g in objectGroups)
{
killIDs.Add(g.LocalId);
g.DeleteGroupFromScene(false);
g.DeleteGroupFromScene(true);
}
m_scene.SendKillObject(killIDs);

11
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
View File

@ -1122,14 +1122,19 @@ namespace OpenSim.Region.Framework.Scenes
/// <param name="datastore"></param>
public void ProcessInventoryBackup(ISimulationDataService datastore)
{
if (HasInventoryChanged)
{
// Removed this because linking will cause an immediate delete of the new
// child prim from the database and the subsequent storing of the prim sees
// the inventory of it as unchanged and doesn't store it at all. The overhead
// of storing prim inventory needlessly is much less than the aggravation
// of prim inventory loss.
// if (HasInventoryChanged)
// {
Items.LockItemsForRead(true);
datastore.StorePrimInventory(m_part.UUID, Items.Values);
Items.LockItemsForRead(false);
HasInventoryChanged = false;
}
// }
}
public class InventoryStringBuilder