diff options
| author | Justin Clark-Casey (justincc) | 2012-08-25 01:09:12 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-08-31 16:28:13 +0100 |
| commit | 206eccc2b62ab99ff60c34ea94dc199666dd26d6 (patch) | |
| tree | 1f4b4b558a81ea67987f4a86aea9ed537b390f8c | |
| parent | minor: Fix bad log message for failure to create an inventory folder (diff) | |
| download | opensim-SC_OLD-206eccc2b62ab99ff60c34ea94dc199666dd26d6.zip opensim-SC_OLD-206eccc2b62ab99ff60c34ea94dc199666dd26d6.tar.gz opensim-SC_OLD-206eccc2b62ab99ff60c34ea94dc199666dd26d6.tar.bz2 opensim-SC_OLD-206eccc2b62ab99ff60c34ea94dc199666dd26d6.tar.xz | |
Allow multiple calling card type inventory folders to be created.
Modern viewers want to create Friends and All folders of this type inside the root Calling Cards folder.
| -rw-r--r-- | OpenSim/Services/InventoryService/XInventoryService.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Services/InventoryService/XInventoryService.cs b/OpenSim/Services/InventoryService/XInventoryService.cs index 7518b86..e10e0be 100644 --- a/OpenSim/Services/InventoryService/XInventoryService.cs +++ b/OpenSim/Services/InventoryService/XInventoryService.cs | |||
| @@ -311,6 +311,7 @@ namespace OpenSim.Services.InventoryService | |||
| 311 | if (folder.Type == (short)AssetType.Folder | 311 | if (folder.Type == (short)AssetType.Folder |
| 312 | || folder.Type == (short)AssetType.Unknown | 312 | || folder.Type == (short)AssetType.Unknown |
| 313 | || folder.Type == (short)AssetType.OutfitFolder | 313 | || folder.Type == (short)AssetType.OutfitFolder |
| 314 | || folder.Type == (short)AssetType.CallingCard | ||
| 314 | || GetFolderForType(folder.Owner, (AssetType)(folder.Type)) == null) | 315 | || GetFolderForType(folder.Owner, (AssetType)(folder.Type)) == null) |
| 315 | { | 316 | { |
| 316 | XInventoryFolder xFolder = ConvertFromOpenSim(folder); | 317 | XInventoryFolder xFolder = ConvertFromOpenSim(folder); |