diff options
author | onefang | 2019-09-11 16:36:50 +1000 |
---|---|---|
committer | onefang | 2019-09-11 16:36:50 +1000 |
commit | 50cd1ffd32f69228e566f2b0b89f86ea0d9fe489 (patch) | |
tree | 52f2ab0c04f1a5d7d6ac5dc872981b4b156447e7 /OpenSim/ConsoleClient/ConsoleClient.cs | |
parent | Renamed branch to SledjChisl. (diff) | |
parent | Bump to release flavour, build 0. (diff) | |
download | opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.zip opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.gz opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.bz2 opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.xz |
Merge branch 'SledjChisl'
Diffstat (limited to 'OpenSim/ConsoleClient/ConsoleClient.cs')
-rw-r--r-- | OpenSim/ConsoleClient/ConsoleClient.cs | 6 |
1 files changed, 4 insertions, 2 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 | |||
110 | public static void LoginReply(string requestUrl, string requestData, string replyData) | 110 | public static void LoginReply(string requestUrl, string requestData, string replyData) |
111 | { | 111 | { |
112 | XmlDocument doc = new XmlDocument(); | 112 | XmlDocument doc = new XmlDocument(); |
113 | doc.XmlResolver=null; | ||
113 | 114 | ||
114 | doc.LoadXml(replyData); | 115 | doc.LoadXml(replyData); |
115 | 116 | ||
@@ -169,6 +170,7 @@ namespace OpenSim.ConsoleClient | |||
169 | public static void ReadResponses(string requestUrl, string requestData, string replyData) | 170 | public static void ReadResponses(string requestUrl, string requestData, string replyData) |
170 | { | 171 | { |
171 | XmlDocument doc = new XmlDocument(); | 172 | XmlDocument doc = new XmlDocument(); |
173 | doc.XmlResolver=null; | ||
172 | 174 | ||
173 | doc.LoadXml(replyData); | 175 | doc.LoadXml(replyData); |
174 | 176 | ||
@@ -178,7 +180,7 @@ namespace OpenSim.ConsoleClient | |||
178 | Requester.MakeRequest(requestUrl, requestData, ReadResponses); | 180 | Requester.MakeRequest(requestUrl, requestData, ReadResponses); |
179 | return; | 181 | return; |
180 | } | 182 | } |
181 | 183 | ||
182 | List<string> lines = new List<string>(); | 184 | List<string> lines = new List<string>(); |
183 | 185 | ||
184 | foreach (XmlNode part in rootNodeL[0].ChildNodes) | 186 | foreach (XmlNode part in rootNodeL[0].ChildNodes) |
@@ -202,7 +204,7 @@ namespace OpenSim.ConsoleClient | |||
202 | string[] parts = l.Split(new char[] {':'}, 3); | 204 | string[] parts = l.Split(new char[] {':'}, 3); |
203 | if (parts.Length != 3) | 205 | if (parts.Length != 3) |
204 | continue; | 206 | continue; |
205 | 207 | ||
206 | if (parts[2].StartsWith("+++") || parts[2].StartsWith("-++")) | 208 | if (parts[2].StartsWith("+++") || parts[2].StartsWith("-++")) |
207 | prompt = parts[2]; | 209 | prompt = parts[2]; |
208 | else | 210 | else |