aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2007-12-31 18:26:24 +0000
committerJustin Clarke Casey2007-12-31 18:26:24 +0000
commit5ef1433e95ca388304c9eef2a4445062c7a082ae (patch)
tree7ca6ac41fce7dd2a4f0f111d1ce42b73de3e50b2
parentCorrect location of DotNetEngine. Remove some debug stuff since my addins pr... (diff)
downloadopensim-SC-5ef1433e95ca388304c9eef2a4445062c7a082ae.zip
opensim-SC-5ef1433e95ca388304c9eef2a4445062c7a082ae.tar.gz
opensim-SC-5ef1433e95ca388304c9eef2a4445062c7a082ae.tar.bz2
opensim-SC-5ef1433e95ca388304c9eef2a4445062c7a082ae.tar.xz
Correctly output library inventory folder type and version information
-rw-r--r--OpenSim/Framework/Communications/LoginService.cs6
-rw-r--r--OpenSim/Framework/InventoryItemBase.cs4
2 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index a9d5d8b..2ac34b1 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -280,8 +280,8 @@ namespace OpenSim.Framework.UserManagement
280 Hashtable TempHash = new Hashtable(); 280 Hashtable TempHash = new Hashtable();
281 TempHash["name"] = folder.name; 281 TempHash["name"] = folder.name;
282 TempHash["parent_id"] = folder.parentID.ToString(); 282 TempHash["parent_id"] = folder.parentID.ToString();
283 TempHash["version"] = folder.version; 283 TempHash["version"] = (Int32)folder.version;
284 TempHash["type_default"] = folder.type; 284 TempHash["type_default"] = (Int32)folder.type;
285 TempHash["folder_id"] = folder.folderID.ToString(); 285 TempHash["folder_id"] = folder.folderID.ToString();
286 folderHashes.Add(TempHash); 286 folderHashes.Add(TempHash);
287 } 287 }
@@ -336,4 +336,4 @@ namespace OpenSim.Framework.UserManagement
336 } 336 }
337 } 337 }
338 } 338 }
339} \ No newline at end of file 339}
diff --git a/OpenSim/Framework/InventoryItemBase.cs b/OpenSim/Framework/InventoryItemBase.cs
index c60fb01..f9903d4 100644
--- a/OpenSim/Framework/InventoryItemBase.cs
+++ b/OpenSim/Framework/InventoryItemBase.cs
@@ -129,7 +129,7 @@ namespace OpenSim.Framework
129 public LLUUID folderID; 129 public LLUUID folderID;
130 130
131 /// <summary> 131 /// <summary>
132 /// Tyep of Items normally stored in this folder 132 /// Type of items normally stored in this folder
133 /// </summary> 133 /// </summary>
134 public short type; 134 public short type;
135 135
@@ -291,4 +291,4 @@ namespace OpenSim.Framework
291 291
292 [XmlElement(ElementName = "folder", IsNullable = true)] public SerializableFolder root; 292 [XmlElement(ElementName = "folder", IsNullable = true)] public SerializableFolder root;
293 } 293 }
294} \ No newline at end of file 294}