diff options
author | lbsa71 | 2007-12-27 21:41:48 +0000 |
---|---|---|
committer | lbsa71 | 2007-12-27 21:41:48 +0000 |
commit | efd90b56b761219af6425b1c7a2cdd3b6ffb4de2 (patch) | |
tree | bf5b897e1e3c13211e3e2fc61d30508b94c928c0 /OpenSim/Framework/Communications/Capabilities/LLSDHelpers.cs | |
parent | * removed always true if (diff) | |
download | opensim-SC-efd90b56b761219af6425b1c7a2cdd3b6ffb4de2.zip opensim-SC-efd90b56b761219af6425b1c7a2cdd3b6ffb4de2.tar.gz opensim-SC-efd90b56b761219af6425b1c7a2cdd3b6ffb4de2.tar.bz2 opensim-SC-efd90b56b761219af6425b1c7a2cdd3b6ffb4de2.tar.xz |
* Optimized usings
* shortened references
* Removed redundant 'this'
* Normalized EOF
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Communications/Capabilities/LLSDHelpers.cs | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDHelpers.cs b/OpenSim/Framework/Communications/Capabilities/LLSDHelpers.cs index 60aa60c..28f838d 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDHelpers.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDHelpers.cs | |||
@@ -30,7 +30,6 @@ using System.Collections; | |||
30 | using System.IO; | 30 | using System.IO; |
31 | using System.Reflection; | 31 | using System.Reflection; |
32 | using System.Xml; | 32 | using System.Xml; |
33 | using libsecondlife; | ||
34 | 33 | ||
35 | namespace OpenSim.Region.Capabilities | 34 | namespace OpenSim.Region.Capabilities |
36 | { | 35 | { |
@@ -77,7 +76,7 @@ namespace OpenSim.Region.Capabilities | |||
77 | writer.WriteString(fields[i].Name); | 76 | writer.WriteString(fields[i].Name); |
78 | writer.WriteEndElement(); | 77 | writer.WriteEndElement(); |
79 | LLSD.LLSDWriteOne(writer, fieldValue); | 78 | LLSD.LLSDWriteOne(writer, fieldValue); |
80 | // libsecondlife.StructuredData.LLSDParser.SerializeXmlElement( | 79 | // libsecondlife.StructuredData.LLSDParser.SerializeXmlElement( |
81 | // writer, libsecondlife.StructuredData.LLSD.FromObject(fieldValue)); | 80 | // writer, libsecondlife.StructuredData.LLSD.FromObject(fieldValue)); |
82 | } | 81 | } |
83 | } | 82 | } |
@@ -102,8 +101,8 @@ namespace OpenSim.Region.Capabilities | |||
102 | else | 101 | else |
103 | { | 102 | { |
104 | LLSD.LLSDWriteOne(writer, obj); | 103 | LLSD.LLSDWriteOne(writer, obj); |
105 | //libsecondlife.StructuredData.LLSDParser.SerializeXmlElement( | 104 | //libsecondlife.StructuredData.LLSDParser.SerializeXmlElement( |
106 | // writer, libsecondlife.StructuredData.LLSD.FromObject(obj)); | 105 | // writer, libsecondlife.StructuredData.LLSD.FromObject(obj)); |
107 | } | 106 | } |
108 | } | 107 | } |
109 | 108 | ||
@@ -122,12 +121,12 @@ namespace OpenSim.Region.Capabilities | |||
122 | FieldInfo field = myType.GetField((string) enumerator.Key); | 121 | FieldInfo field = myType.GetField((string) enumerator.Key); |
123 | if (field != null) | 122 | if (field != null) |
124 | { | 123 | { |
125 | // if (enumerator.Value is libsecondlife.StructuredData.LLSDMap) | 124 | // if (enumerator.Value is libsecondlife.StructuredData.LLSDMap) |
126 | if (enumerator.Value is Hashtable) | 125 | if (enumerator.Value is Hashtable) |
127 | { | 126 | { |
128 | object fieldValue = field.GetValue(obj); | 127 | object fieldValue = field.GetValue(obj); |
129 | DeserialiseLLSDMap((Hashtable)enumerator.Value, fieldValue); | 128 | DeserialiseLLSDMap((Hashtable) enumerator.Value, fieldValue); |
130 | // DeserialiseLLSDMap((libsecondlife.StructuredData.LLSDMap) enumerator.Value, fieldValue); | 129 | // DeserialiseLLSDMap((libsecondlife.StructuredData.LLSDMap) enumerator.Value, fieldValue); |
131 | } | 130 | } |
132 | else if (enumerator.Value is ArrayList) | 131 | else if (enumerator.Value is ArrayList) |
133 | { | 132 | { |
@@ -149,4 +148,4 @@ namespace OpenSim.Region.Capabilities | |||
149 | return obj; | 148 | return obj; |
150 | } | 149 | } |
151 | } | 150 | } |
152 | } | 151 | } \ No newline at end of file |