diff options
author | Justin Clarke Casey | 2008-07-12 22:14:38 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-07-12 22:14:38 +0000 |
commit | a89385818d35dd991aa29f835fdb742e0923c26e (patch) | |
tree | 56cd5b650bcc8aceafcbd4a1cb7f3026e8d9c30f /OpenSim/Region/Environment/Scenes/Scene.cs | |
parent | minor: method documentation (diff) | |
download | opensim-SC_OLD-a89385818d35dd991aa29f835fdb742e0923c26e.zip opensim-SC_OLD-a89385818d35dd991aa29f835fdb742e0923c26e.tar.gz opensim-SC_OLD-a89385818d35dd991aa29f835fdb742e0923c26e.tar.bz2 opensim-SC_OLD-a89385818d35dd991aa29f835fdb742e0923c26e.tar.xz |
* On archive loading, tell the user how many objects we are ignoring because they already exist in the scene
* (ability to give objects new uuids will come later)
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 05026c3..1564556 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -1665,9 +1665,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
1665 | /// Add an object into the scene that has come from storage | 1665 | /// Add an object into the scene that has come from storage |
1666 | /// </summary> | 1666 | /// </summary> |
1667 | /// <param name="sceneObject"></param> | 1667 | /// <param name="sceneObject"></param> |
1668 | public void AddRestoredSceneObject(SceneObjectGroup sceneObject, bool attachToBackup) | 1668 | public bool AddRestoredSceneObject(SceneObjectGroup sceneObject, bool attachToBackup) |
1669 | { | 1669 | { |
1670 | m_innerScene.AddRestoredSceneObject(sceneObject, attachToBackup); | 1670 | return m_innerScene.AddRestoredSceneObject(sceneObject, attachToBackup); |
1671 | } | 1671 | } |
1672 | 1672 | ||
1673 | /// <summary> | 1673 | /// <summary> |
@@ -1678,9 +1678,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
1678 | /// If true, the object is made persistent into the scene. | 1678 | /// If true, the object is made persistent into the scene. |
1679 | /// If false, the object will not persist over server restarts | 1679 | /// If false, the object will not persist over server restarts |
1680 | /// </param> | 1680 | /// </param> |
1681 | public void AddNewSceneObject(SceneObjectGroup sceneObject, bool attachToBackup) | 1681 | public bool AddNewSceneObject(SceneObjectGroup sceneObject, bool attachToBackup) |
1682 | { | 1682 | { |
1683 | m_innerScene.AddNewSceneObject(sceneObject, attachToBackup); | 1683 | return m_innerScene.AddNewSceneObject(sceneObject, attachToBackup); |
1684 | } | 1684 | } |
1685 | 1685 | ||
1686 | /// <summary> | 1686 | /// <summary> |