aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/IXInventoryData.cs
diff options
context:
space:
mode:
authorBlueWall2012-11-25 17:03:14 -0500
committerBlueWall2012-11-25 17:03:14 -0500
commitc754003944d0166bf50b4f94b0c0eea642503bb0 (patch)
treedfa1c2020d5500d510519d5b2b3236600692f277 /OpenSim/Data/IXInventoryData.cs
parentMerge branch 'master' into connector_plugin (diff)
parentCombine TestDeleteSceneObjectAsync() with TestDeRezSceneObject() as they are ... (diff)
downloadopensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.zip
opensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.gz
opensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.bz2
opensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.xz
Merge branch 'master' into connector_plugin
Conflicts: OpenSim/Server/Base/ServicesServerBase.cs
Diffstat (limited to 'OpenSim/Data/IXInventoryData.cs')
-rw-r--r--OpenSim/Data/IXInventoryData.cs17
1 files changed, 16 insertions, 1 deletions
diff --git a/OpenSim/Data/IXInventoryData.cs b/OpenSim/Data/IXInventoryData.cs
index e64a828..ca47506 100644
--- a/OpenSim/Data/IXInventoryData.cs
+++ b/OpenSim/Data/IXInventoryData.cs
@@ -116,7 +116,22 @@ namespace OpenSim.Data
116 /// <returns>true if the delete was successful, false if it was not</returns> 116 /// <returns>true if the delete was successful, false if it was not</returns>
117 bool DeleteItems(string[] fields, string[] vals); 117 bool DeleteItems(string[] fields, string[] vals);
118 118
119 bool MoveItem(string id, string newParent); 119 /// <summary>
120 /// Move an item to another folder.
121 /// </summary>
122 /// <returns>/returns>
123 /// <param name='id'>UUID of the item</param>
124 /// <param name='newParent'>UUID of the new parent folder.</param>
125 bool MoveItem(string id, string newParentFolderID);
126
127 /// <summary>
128 /// Move a folder to another folder.
129 /// </summary>
130 /// <returns>/returns>
131 /// <param name='id'>UUID of the item</param>
132 /// <param name='newParent'>UUID of the new parent folder.</param>
133 bool MoveFolder(string id, string newParentFolderID);
134
120 XInventoryItem[] GetActiveGestures(UUID principalID); 135 XInventoryItem[] GetActiveGestures(UUID principalID);
121 int GetAssetPermissions(UUID principalID, UUID assetID); 136 int GetAssetPermissions(UUID principalID, UUID assetID);
122 } 137 }