diff options
author | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
commit | 7d89e122930be39e84a6d174548fa2d12ac0484a (patch) | |
tree | e5aa5752f988a9aba2a969f49e5e208985eda80c /OpenSim/Framework/Communications/Capabilities/LLSDHelpers.cs | |
parent | * minor: speculatively try a change to bamboo.build to see if this generates ... (diff) | |
download | opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.zip opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2 opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.xz |
* This is the fabled LibOMV update with all of the libOMV types from JHurliman
* This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle.
* This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big!
* Essentially we're back at square 1 in the testing phase.. so lets identify things that broke.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Communications/Capabilities/LLSDHelpers.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDHelpers.cs b/OpenSim/Framework/Communications/Capabilities/LLSDHelpers.cs index 507f12b..b14bfdd 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDHelpers.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDHelpers.cs | |||
@@ -86,8 +86,8 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
86 | writer.WriteString(fieldName); | 86 | writer.WriteString(fieldName); |
87 | writer.WriteEndElement(); | 87 | writer.WriteEndElement(); |
88 | LLSD.LLSDWriteOne(writer, fieldValue); | 88 | LLSD.LLSDWriteOne(writer, fieldValue); |
89 | // libsecondlife.StructuredData.LLSDParser.SerializeXmlElement( | 89 | // OpenMetaverse.StructuredData.LLSDParser.SerializeXmlElement( |
90 | // writer, libsecondlife.StructuredData.LLSD.FromObject(fieldValue)); | 90 | // writer, OpenMetaverse.StructuredData.LLSD.FromObject(fieldValue)); |
91 | } | 91 | } |
92 | } | 92 | } |
93 | writer.WriteEndElement(); | 93 | writer.WriteEndElement(); |
@@ -111,8 +111,8 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
111 | else | 111 | else |
112 | { | 112 | { |
113 | LLSD.LLSDWriteOne(writer, obj); | 113 | LLSD.LLSDWriteOne(writer, obj); |
114 | //libsecondlife.StructuredData.LLSDParser.SerializeXmlElement( | 114 | //OpenMetaverse.StructuredData.LLSDParser.SerializeXmlElement( |
115 | // writer, libsecondlife.StructuredData.LLSD.FromObject(obj)); | 115 | // writer, OpenMetaverse.StructuredData.LLSD.FromObject(obj)); |
116 | } | 116 | } |
117 | } | 117 | } |
118 | 118 | ||
@@ -133,12 +133,12 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
133 | FieldInfo field = myType.GetField(keyName); | 133 | FieldInfo field = myType.GetField(keyName); |
134 | if (field != null) | 134 | if (field != null) |
135 | { | 135 | { |
136 | // if (enumerator.Value is libsecondlife.StructuredData.LLSDMap) | 136 | // if (enumerator.Value is OpenMetaverse.StructuredData.LLSDMap) |
137 | if (enumerator.Value is Hashtable) | 137 | if (enumerator.Value is Hashtable) |
138 | { | 138 | { |
139 | object fieldValue = field.GetValue(obj); | 139 | object fieldValue = field.GetValue(obj); |
140 | DeserialiseLLSDMap((Hashtable) enumerator.Value, fieldValue); | 140 | DeserialiseLLSDMap((Hashtable) enumerator.Value, fieldValue); |
141 | // DeserialiseLLSDMap((libsecondlife.StructuredData.LLSDMap) enumerator.Value, fieldValue); | 141 | // DeserialiseLLSDMap((OpenMetaverse.StructuredData.LLSDMap) enumerator.Value, fieldValue); |
142 | } | 142 | } |
143 | else if (enumerator.Value is ArrayList) | 143 | else if (enumerator.Value is ArrayList) |
144 | { | 144 | { |
@@ -160,4 +160,4 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
160 | return obj; | 160 | return obj; |
161 | } | 161 | } |
162 | } | 162 | } |
163 | } \ No newline at end of file | 163 | } |