Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
This commit is contained in:
Melanie
2012-06-15 02:52:56 +01:00
2 changed files with 15 additions and 1 deletions

View File

@@ -786,7 +786,7 @@ namespace OpenSim.Framework.Servers.HttpServer
requestStream.Close();
//m_log.Debug(requestBody);
requestBody = requestBody.Replace("<base64></base64>", "");
string responseString = null;
string responseString = String.Empty;
XmlRpcRequest xmlRprcRequest = null;
try