diff options
author | lbsa71 | 2009-02-02 14:57:01 +0000 |
---|---|---|
committer | lbsa71 | 2009-02-02 14:57:01 +0000 |
commit | 8a098bf12c620bd56f3371f1cf8a90ffa04b16c8 (patch) | |
tree | 73081d45468c91406e6f7b7b75148b5c69cd8ad9 /OpenSim/Region/Environment/Scenes/Scene.cs | |
parent | [patching previous patch and also taking the chance of fixing the (diff) | |
download | opensim-SC_OLD-8a098bf12c620bd56f3371f1cf8a90ffa04b16c8.zip opensim-SC_OLD-8a098bf12c620bd56f3371f1cf8a90ffa04b16c8.tar.gz opensim-SC_OLD-8a098bf12c620bd56f3371f1cf8a90ffa04b16c8.tar.bz2 opensim-SC_OLD-8a098bf12c620bd56f3371f1cf8a90ffa04b16c8.tar.xz |
* Minor refactoring and comments updates
* Ignored some gens
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 436b24e..33dae66 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -1881,7 +1881,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
1881 | /// <summary> | 1881 | /// <summary> |
1882 | /// Synchronously delete the given object from the scene. | 1882 | /// Synchronously delete the given object from the scene. |
1883 | /// </summary> | 1883 | /// </summary> |
1884 | /// <param name="group"></param> | 1884 | /// <param name="group">Object Id</param> |
1885 | /// <param name="silent">Suppress broadcasting changes to other clients.</param> | ||
1885 | public void DeleteSceneObject(SceneObjectGroup group, bool silent) | 1886 | public void DeleteSceneObject(SceneObjectGroup group, bool silent) |
1886 | { | 1887 | { |
1887 | //SceneObjectPart rootPart = group.GetChildPart(group.UUID); | 1888 | //SceneObjectPart rootPart = group.GetChildPart(group.UUID); |
@@ -1924,15 +1925,19 @@ namespace OpenSim.Region.Environment.Scenes | |||
1924 | /// Unlink the given object from the scene. Unlike delete, this just removes the record of the object - the | 1925 | /// Unlink the given object from the scene. Unlike delete, this just removes the record of the object - the |
1925 | /// object itself is not destroyed. | 1926 | /// object itself is not destroyed. |
1926 | /// </summary> | 1927 | /// </summary> |
1927 | /// <param name="uuid"></param> | 1928 | /// <param name="uuid">Id of object.</param> |
1928 | /// <returns>true if the object was in the scene, false if it was not</returns> | 1929 | /// <returns>true if the object was in the scene, false if it was not</returns> |
1929 | public bool UnlinkSceneObject(UUID uuid, bool resultOfLinkingObjects) | 1930 | /// <param name="softDelete">If true, only deletes from scene, but keeps object in database.</param> |
1931 | public bool UnlinkSceneObject(UUID uuid, bool softDelete) | ||
1930 | { | 1932 | { |
1931 | if (m_sceneGraph.DeleteSceneObject(uuid, resultOfLinkingObjects)) | 1933 | if (m_sceneGraph.DeleteSceneObject(uuid, softDelete)) |
1932 | { | 1934 | { |
1933 | if (!resultOfLinkingObjects) | 1935 | if (!softDelete) |
1936 | { | ||
1934 | m_storageManager.DataStore.RemoveObject(uuid, | 1937 | m_storageManager.DataStore.RemoveObject(uuid, |
1935 | m_regInfo.RegionID); | 1938 | m_regInfo.RegionID); |
1939 | } | ||
1940 | |||
1936 | return true; | 1941 | return true; |
1937 | } | 1942 | } |
1938 | 1943 | ||