diff options
author | Justin Clark-Casey (justincc) | 2012-11-10 05:43:57 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-11-10 05:43:57 +0000 |
commit | c94240ba5b0f3ca77abc42245b3f2c6d0af9a138 (patch) | |
tree | d93dbdd0cd08596baf292b85cbc86814890fd119 /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |
parent | MapSearchModule also converted to new region module interface (37 to go). (diff) | |
download | opensim-SC_OLD-c94240ba5b0f3ca77abc42245b3f2c6d0af9a138.zip opensim-SC_OLD-c94240ba5b0f3ca77abc42245b3f2c6d0af9a138.tar.gz opensim-SC_OLD-c94240ba5b0f3ca77abc42245b3f2c6d0af9a138.tar.bz2 opensim-SC_OLD-c94240ba5b0f3ca77abc42245b3f2c6d0af9a138.tar.xz |
Uncomment SceneObjectBasicTests.TestDeleteSceneObjectAsyncToUserInventory() and make it compile again
Not currently in test suite since not yet working.
Also add method doc to Scene.DeRezObjects()
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index b23ddb4..ad40d6b 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -1909,8 +1909,19 @@ namespace OpenSim.Region.Framework.Scenes | |||
1909 | } | 1909 | } |
1910 | } | 1910 | } |
1911 | 1911 | ||
1912 | public virtual void DeRezObjects(IClientAPI remoteClient, List<uint> localIDs, | 1912 | /// <summary> |
1913 | UUID groupID, DeRezAction action, UUID destinationID) | 1913 | /// Derez one or more objects from the scene. |
1914 | /// </summary> | ||
1915 | /// <remarks> | ||
1916 | /// Won't actually remove the scene object in the case where the object is being copied to a user inventory. | ||
1917 | /// </remarks> | ||
1918 | /// <param name='remoteClient'>Client requesting derez</param> | ||
1919 | /// <param name='localIDs'>Local ids of root parts of objects to delete.</param> | ||
1920 | /// <param name='groupID'>Not currently used. Here because the client passes this to us.</param> | ||
1921 | /// <param name='action'>DeRezAction</param> | ||
1922 | /// <param name='destinationID'>User folder ID to place derezzed object</param> | ||
1923 | public virtual void DeRezObjects( | ||
1924 | IClientAPI remoteClient, List<uint> localIDs, UUID groupID, DeRezAction action, UUID destinationID) | ||
1914 | { | 1925 | { |
1915 | // First, see of we can perform the requested action and | 1926 | // First, see of we can perform the requested action and |
1916 | // build a list of eligible objects | 1927 | // build a list of eligible objects |