ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-09 18:55:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

* On archive loading, tell the user how many objects we are ignoring because they already exist in the scene

Browse Source 
* (ability to give objects new uuids will come later)
This commit is contained in:
Justin Clarke Casey
2008-07-12 22:14:38 +00:00
parent 23c4a409b7
commit a89385818d
7 changed files with 34 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenSim/Region/Environment/Scenes/InnerScene.cs
View File

@@ -196,7 +196,10 @@ namespace OpenSim.Region.Environment.Scenes
/// If true, changes to the object will be reflected in its persisted data
/// If false, the persisted data will not be changed even if the object in the scene is changed
/// </param>
protected internal void AddRestoredSceneObject(SceneObjectGroup sceneObject, bool attachToBackup)
/// <returns>
/// true if the object was added, false if an object with the same uuid was already in the scene
/// </returns>
protected internal bool AddRestoredSceneObject(SceneObjectGroup sceneObject, bool attachToBackup)
{
sceneObject.RegionHandle = m_regInfo.RegionHandle;
sceneObject.SetScene(m_parentScene);
@@ -208,7 +211,7 @@ namespace OpenSim.Region.Environment.Scenes
sceneObject.UpdateParentIDs();
AddSceneObject(sceneObject, attachToBackup);
return AddSceneObject(sceneObject, attachToBackup);
}
/// <summary>
@@ -220,14 +223,15 @@ namespace OpenSim.Region.Environment.Scenes
/// If true, the object is made persistent into the scene.
/// If false, the object will not persist over server restarts
/// </param>
/// <returns>true if the object was added, false if an object with the same uuid was already in the scene
/// <returns>
/// true if the object was added, false if an object with the same uuid was already in the scene
/// </returns>
protected internal void AddNewSceneObject(SceneObjectGroup sceneObject, bool attachToBackup)
protected internal bool AddNewSceneObject(SceneObjectGroup sceneObject, bool attachToBackup)
{
// Ensure that we persist this new scene object
sceneObject.HasGroupChanged = true;
AddSceneObject(sceneObject, attachToBackup);
return AddSceneObject(sceneObject, attachToBackup);
}
/// <summary>