aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2009-09-10 18:14:34 +0100
committerJustin Clark-Casey (justincc)2009-09-10 18:14:34 +0100
commit552ba5334f9d44001768400e3d4315e0f4fa5a28 (patch)
treec47d38287011840fb08e5ecbdb879952e3420312 /OpenSim/Framework
parentrefactor: Replace some iar item name generation in tests with helper function (diff)
parentMerge branch 'master' of ssh://MyConnection/var/git/opensim (diff)
downloadopensim-SC_OLD-552ba5334f9d44001768400e3d4315e0f4fa5a28.zip
opensim-SC_OLD-552ba5334f9d44001768400e3d4315e0f4fa5a28.tar.gz
opensim-SC_OLD-552ba5334f9d44001768400e3d4315e0f4fa5a28.tar.bz2
opensim-SC_OLD-552ba5334f9d44001768400e3d4315e0f4fa5a28.tar.xz
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Capabilities/Caps.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Capabilities/Caps.cs b/OpenSim/Framework/Capabilities/Caps.cs
index 665bfe5..1dfb2d4 100644
--- a/OpenSim/Framework/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Capabilities/Caps.cs
@@ -502,7 +502,7 @@ namespace OpenSim.Framework.Capabilities
502 llsdFolder.folder_id = invFolder.ID; 502 llsdFolder.folder_id = invFolder.ID;
503 llsdFolder.parent_id = invFolder.ParentID; 503 llsdFolder.parent_id = invFolder.ParentID;
504 llsdFolder.name = invFolder.Name; 504 llsdFolder.name = invFolder.Name;
505 if (invFolder.Type == -1) 505 if (invFolder.Type < 0 || invFolder.Type >= TaskInventoryItem.Types.Length)
506 llsdFolder.type = "-1"; 506 llsdFolder.type = "-1";
507 else 507 else
508 llsdFolder.type = TaskInventoryItem.Types[invFolder.Type]; 508 llsdFolder.type = TaskInventoryItem.Types[invFolder.Type];