Merge branch 'master' of /var/git/opensim/

2010-10-14 07:20:09 -07:00 · 2010-10-14 07:20:09 -07:00 · 64a41f67c5
--- a/bin/OpenMetaverse.Rendering.Meshmerizer.dll
+++ b/bin/OpenMetaverse.Rendering.Meshmerizer.dll
--- a/bin/OpenMetaverse.StructuredData.XML
+++ b/bin/OpenMetaverse.StructuredData.XML
@ -175,7 +175,7 @@
            <param name="toFind"></param>
            <returns></returns>
        </member>
-        <member name="M:OpenMetaverse.StructuredData.OSDParser.FindByteArray(System.IO.Stream,System.Byte[])">
+        <member name="M:OpenMetaverse.StructuredData.OSDParser.FindString(System.IO.Stream,System.String)">
            <summary>
            </summary>
--- a/bin/OpenMetaverse.StructuredData.dll
+++ b/bin/OpenMetaverse.StructuredData.dll
--- a/bin/OpenMetaverse.XML
+++ b/bin/OpenMetaverse.XML
--- a/bin/OpenMetaverse.dll
+++ b/bin/OpenMetaverse.dll
--- a/bin/OpenMetaverseTypes.XML
+++ b/bin/OpenMetaverseTypes.XML
--- a/bin/OpenMetaverseTypes.dll
+++ b/bin/OpenMetaverseTypes.dll