aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-04-24 15:56:41 +0000
committerJustin Clarke Casey2009-04-24 15:56:41 +0000
commit35c7aae455b110d99c578c1bd0dc0f21a7fc6fa3 (patch)
tree8b71da96202e2e6318b01f7848e962ee95576f8f
parent* minor: make inventory item deserialization code easier to read (diff)
downloadopensim-SC_OLD-35c7aae455b110d99c578c1bd0dc0f21a7fc6fa3.zip
opensim-SC_OLD-35c7aae455b110d99c578c1bd0dc0f21a7fc6fa3.tar.gz
opensim-SC_OLD-35c7aae455b110d99c578c1bd0dc0f21a7fc6fa3.tar.bz2
opensim-SC_OLD-35c7aae455b110d99c578c1bd0dc0f21a7fc6fa3.tar.xz
* correct spelling mistake in item seiralization
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs4
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs1
2 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs b/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs
index b9c6206..e0ddc96 100644
--- a/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs
+++ b/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs
@@ -81,7 +81,7 @@ namespace OpenSim.Framework.Serialization.External
81 item.SalePrice = Convert.ToInt32( xtr.ReadElementString("SalePrice")); 81 item.SalePrice = Convert.ToInt32( xtr.ReadElementString("SalePrice"));
82 item.BasePermissions = Convert.ToUInt32( xtr.ReadElementString("BasePermissions")); 82 item.BasePermissions = Convert.ToUInt32( xtr.ReadElementString("BasePermissions"));
83 item.CurrentPermissions = Convert.ToUInt32( xtr.ReadElementString("CurrentPermissions")); 83 item.CurrentPermissions = Convert.ToUInt32( xtr.ReadElementString("CurrentPermissions"));
84 item.EveryOnePermissions = Convert.ToUInt32( xtr.ReadElementString("EveryOnePermssions")); 84 item.EveryOnePermissions = Convert.ToUInt32( xtr.ReadElementString("EveryOnePermissions"));
85 item.NextPermissions = Convert.ToUInt32( xtr.ReadElementString("NextPermissions")); 85 item.NextPermissions = Convert.ToUInt32( xtr.ReadElementString("NextPermissions"));
86 item.Flags = Convert.ToUInt32( xtr.ReadElementString("Flags")); 86 item.Flags = Convert.ToUInt32( xtr.ReadElementString("Flags"));
87 item.GroupID = UUID.Parse( xtr.ReadElementString("GroupID")); 87 item.GroupID = UUID.Parse( xtr.ReadElementString("GroupID"));
@@ -143,7 +143,7 @@ namespace OpenSim.Framework.Serialization.External
143 writer.WriteStartElement("CurrentPermissions"); 143 writer.WriteStartElement("CurrentPermissions");
144 writer.WriteString(inventoryItem.CurrentPermissions.ToString()); 144 writer.WriteString(inventoryItem.CurrentPermissions.ToString());
145 writer.WriteEndElement(); 145 writer.WriteEndElement();
146 writer.WriteStartElement("EveryOnePermssions"); 146 writer.WriteStartElement("EveryOnePermissions");
147 writer.WriteString(inventoryItem.EveryOnePermissions.ToString()); 147 writer.WriteString(inventoryItem.EveryOnePermissions.ToString());
148 writer.WriteEndElement(); 148 writer.WriteEndElement();
149 writer.WriteStartElement("NextPermissions"); 149 writer.WriteStartElement("NextPermissions");
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
index 2d6187f..69a4bd7 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
@@ -48,7 +48,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
48 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 48 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
49 49
50 protected TarArchiveReader archive; 50 protected TarArchiveReader archive;
51 private static ASCIIEncoding m_asciiEncoding = new ASCIIEncoding();
52 51
53 private CachedUserInfo m_userInfo; 52 private CachedUserInfo m_userInfo;
54 private string m_invPath; 53 private string m_invPath;