Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

author: Diva Canto 2014-02-21 10:05:06 -0800
committer: Diva Canto 2014-02-21 10:05:06 -0800
commit: 97c74afca897acf8f000b0560ff041fd51897e5b (patch)
tree: 71efc4ababc6f428de291a56e289fa158cbf2272 /OpenSim/Services/Interfaces/IInventoryService.cs
parent: Added 2 new behavirors to pCampBot. These are part of a systematic study I'm ... (diff)
parent: If texture decode fails in Warp3D map maker, log uuid of asset that failed to... (diff)
download: opensim-SC_OLD-97c74afca897acf8f000b0560ff041fd51897e5b.zip
opensim-SC_OLD-97c74afca897acf8f000b0560ff041fd51897e5b.tar.gz
opensim-SC_OLD-97c74afca897acf8f000b0560ff041fd51897e5b.tar.bz2
opensim-SC_OLD-97c74afca897acf8f000b0560ff041fd51897e5b.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/Interfaces/IInventoryService.cs b/OpenSim/Services/Interfaces/IInventoryService.cs
index a8bfe47..36634a3 100644
--- a/OpenSim/Services/Interfaces/IInventoryService.cs
+++ b/OpenSim/Services/Interfaces/IInventoryService.cs
@@ -91,7 +91,7 @@ namespace OpenSim.Services.Interfaces
        /// </summary>
        /// <param name="userId"></param>
        /// <param name="folderID"></param>
-        /// <returns></returns>
+        /// <returns>Inventory content.  null if the request failed.</returns>
        InventoryCollection GetFolderContent(UUID userID, UUID folderID);
        
        /// <summary>
author	Diva Canto	2014-02-21 10:05:06 -0800
committer	Diva Canto	2014-02-21 10:05:06 -0800
commit	97c74afca897acf8f000b0560ff041fd51897e5b (patch)
tree	71efc4ababc6f428de291a56e289fa158cbf2272 /OpenSim/Services/Interfaces/IInventoryService.cs
parent	Added 2 new behavirors to pCampBot. These are part of a systematic study I'm ... (diff)
parent	If texture decode fails in Warp3D map maker, log uuid of asset that failed to... (diff)
download	opensim-SC_OLD-97c74afca897acf8f000b0560ff041fd51897e5b.zip opensim-SC_OLD-97c74afca897acf8f000b0560ff041fd51897e5b.tar.gz opensim-SC_OLD-97c74afca897acf8f000b0560ff041fd51897e5b.tar.bz2 opensim-SC_OLD-97c74afca897acf8f000b0560ff041fd51897e5b.tar.xz

diff --git a/OpenSim/Services/Interfaces/IInventoryService.cs b/OpenSim/Services/Interfaces/IInventoryService.cs index a8bfe47..36634a3 100644 --- a/OpenSim/Services/Interfaces/IInventoryService.cs +++ b/OpenSim/Services/Interfaces/IInventoryService.cs
@@ -91,7 +91,7 @@ namespace OpenSim.Services.Interfaces
91	/// </summary>	91	/// </summary>
92	/// <param name="userId"></param>	92	/// <param name="userId"></param>
93	/// <param name="folderID"></param>	93	/// <param name="folderID"></param>
94	/// <returns></returns>	94	/// <returns>Inventory content. null if the request failed.</returns>
95	InventoryCollection GetFolderContent(UUID userID, UUID folderID);	95	InventoryCollection GetFolderContent(UUID userID, UUID folderID);
96		96
97	/// <summary>	97	/// <summary>