Dump OpenSim 0.9.0.1 into it's own branch.

2 files changed, 8 insertions, 6 deletions

diff --git a/OpenSim/ConsoleClient/ConsoleClient.cs b/OpenSim/ConsoleClient/ConsoleClient.cs
index 7c003ea..c395cd7 100644
--- a/OpenSim/ConsoleClient/ConsoleClient.cs
+++ b/OpenSim/ConsoleClient/ConsoleClient.cs
@@ -110,6 +110,7 @@ namespace OpenSim.ConsoleClient
         public static void LoginReply(string requestUrl, string requestData, string replyData)
         {
             XmlDocument doc = new XmlDocument();
+            doc.XmlResolver=null;
 
             doc.LoadXml(replyData);
 
@@ -169,6 +170,7 @@ namespace OpenSim.ConsoleClient
         public static void ReadResponses(string requestUrl, string requestData, string replyData)
         {
             XmlDocument doc = new XmlDocument();
+            doc.XmlResolver=null;
 
             doc.LoadXml(replyData);
 
@@ -178,7 +180,7 @@ namespace OpenSim.ConsoleClient
                 Requester.MakeRequest(requestUrl, requestData, ReadResponses);
                 return;
             }
-            
+
             List<string> lines = new List<string>();
 
             foreach (XmlNode part in rootNodeL[0].ChildNodes)
@@ -202,7 +204,7 @@ namespace OpenSim.ConsoleClient
                 string[] parts = l.Split(new char[] {':'}, 3);
                 if (parts.Length != 3)
                     continue;
-                
+
                 if (parts[2].StartsWith("+++") || parts[2].StartsWith("-++"))
                     prompt = parts[2];
                 else
diff --git a/OpenSim/ConsoleClient/Properties/AssemblyInfo.cs b/OpenSim/ConsoleClient/Properties/AssemblyInfo.cs
index 9c0c784..87bff14 100644
--- a/OpenSim/ConsoleClient/Properties/AssemblyInfo.cs
+++ b/OpenSim/ConsoleClient/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("OpenSim.ConsoleClient")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //