Merge branch 'diva-textures-osgrid'

8 files changed, 32 insertions, 15 deletions

diff --git a/OpenSim/Framework/AssetLandmark.cs b/OpenSim/Framework/AssetLandmark.cs
index 7c87c34..fd7a2cd 100644
--- a/OpenSim/Framework/AssetLandmark.cs
+++ b/OpenSim/Framework/AssetLandmark.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Framework
 
         private void InternData()
         {
-            string temp = Encoding.UTF8.GetString(Data).Trim();
+            string temp = Util.UTF8.GetString(Data).Trim();
             string[] parts = temp.Split('\n');
             int.TryParse(parts[0].Substring(17, 1), out Version);
             UUID.TryParse(parts[1].Substring(10, 36), out RegionID);
diff --git a/OpenSim/Framework/Capabilities/LLSD.cs b/OpenSim/Framework/Capabilities/LLSD.cs
index 84f43c1..eec9e61 100644
--- a/OpenSim/Framework/Capabilities/LLSD.cs
+++ b/OpenSim/Framework/Capabilities/LLSD.cs
@@ -112,7 +112,7 @@ namespace OpenSim.Framework.Capabilities
 
             writer.Close();
 
-            return Encoding.UTF8.GetBytes(sw.ToString());
+            return Util.UTF8.GetBytes(sw.ToString());
         }
 
         /// <summary>
@@ -329,7 +329,7 @@ namespace OpenSim.Framework.Capabilities
 
                         reader.Read();
                         FromBase64Transform b64 = new FromBase64Transform(FromBase64TransformMode.IgnoreWhiteSpaces);
-                        byte[] inp = Encoding.UTF8.GetBytes(reader.ReadString());
+                        byte[] inp = Util.UTF8.GetBytes(reader.ReadString());
                         ret = b64.TransformFinalBlock(inp, 0, inp.Length);
                         break;
                     }
diff --git a/OpenSim/Framework/Capabilities/LLSDStreamHandler.cs b/OpenSim/Framework/Capabilities/LLSDStreamHandler.cs
index df48b35..7aaa994 100644
--- a/OpenSim/Framework/Capabilities/LLSDStreamHandler.cs
+++ b/OpenSim/Framework/Capabilities/LLSDStreamHandler.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Framework.Capabilities
         public override byte[] Handle(string path, Stream request,
                                       OSHttpRequest httpRequest, OSHttpResponse httpResponse)
         {
-            //Encoding encoding = Encoding.UTF8;
+            //Encoding encoding = Util.UTF8;
             //StreamReader streamReader = new StreamReader(request, false);
 
             //string requestBody = streamReader.ReadToEnd();
diff --git a/OpenSim/Framework/Communications/XMPP/XmppWriter.cs b/OpenSim/Framework/Communications/XMPP/XmppWriter.cs
index b52eda7..415d808 100644
--- a/OpenSim/Framework/Communications/XMPP/XmppWriter.cs
+++ b/OpenSim/Framework/Communications/XMPP/XmppWriter.cs
@@ -38,7 +38,7 @@ namespace OpenSim.Framework.Communications.XMPP
         {
         }
 
-        public XMPPWriter(IOStream stream) : this(stream, Encoding.UTF8)
+        public XMPPWriter(IOStream stream) : this(stream, Util.UTF8)
         {
         }
 
diff --git a/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs b/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs
index 318d2c3..3dce578 100644
--- a/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs
+++ b/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs
@@ -77,7 +77,7 @@ namespace OpenSim.Framework.Configuration.HTTP
                     count = resStream.Read(buf, 0, buf.Length);
                     if (count != 0)
                     {
-                        tempString = Encoding.UTF8.GetString(buf, 0, count);
+                        tempString = Util.UTF8.GetString(buf, 0, count);
                         sb.Append(tempString);
                     }
                 } while (count > 0);
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index 6c63c6c..942fed9 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -979,7 +979,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             }
 
             // response.ContentType = "application/llsd+json";
-            // return Encoding.UTF8.GetBytes(OSDParser.SerializeJsonString(llsdResponse));
+            // return Util.UTF8.GetBytes(OSDParser.SerializeJsonString(llsdResponse));
             response.ContentType = "application/llsd+xml";
             return OSDParser.SerializeLLSDXmlBytes(llsdResponse);
         }
diff --git a/OpenSim/Framework/Servers/HttpServer/SynchronousRestObjectRequester.cs b/OpenSim/Framework/Servers/HttpServer/SynchronousRestObjectRequester.cs
index ec9bd4f..eab463c 100644
--- a/OpenSim/Framework/Servers/HttpServer/SynchronousRestObjectRequester.cs
+++ b/OpenSim/Framework/Servers/HttpServer/SynchronousRestObjectRequester.cs
@@ -58,6 +58,7 @@ namespace OpenSim.Framework.Servers.HttpServer
         public static TResponse MakeRequest<TRequest, TResponse>(string verb, string requestUrl, TRequest obj)
         {
             Type type = typeof (TRequest);
+            TResponse deserial = default(TResponse);
 
             WebRequest request = WebRequest.Create(requestUrl);
             request.Method = verb;
@@ -81,19 +82,33 @@ namespace OpenSim.Framework.Servers.HttpServer
                 int length = (int) buffer.Length;
                 request.ContentLength = length;
 
-                Stream requestStream = request.GetRequestStream();
-                requestStream.Write(buffer.ToArray(), 0, length);
+                Stream requestStream = null;
+                try
+                {
+                    requestStream = request.GetRequestStream();
+                    requestStream.Write(buffer.ToArray(), 0, length);
+                }
+                catch (Exception)
+                {
+                    return deserial;
+                }
+                finally
+                {
+                    if (requestStream != null)
+                        requestStream.Close();
+                }
             }
 
-            TResponse deserial = default(TResponse);
             try
             {
                 using (WebResponse resp = request.GetResponse())
                 {
                     if (resp.ContentLength > 0)
                     {
+                        Stream respStream = resp.GetResponseStream();
                         XmlSerializer deserializer = new XmlSerializer(typeof(TResponse));
-                        deserial = (TResponse)deserializer.Deserialize(resp.GetResponseStream());
+                        deserial = (TResponse)deserializer.Deserialize(respStream);
+                        respStream.Close();
                     }
                 }
             }
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index 17fc58c..0851d26 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -103,6 +103,8 @@ namespace OpenSim.Framework
         }
 
 
+        public static Encoding UTF8 = Encoding.UTF8;
+
         /// <value>
         /// Well known UUID for the blank texture used in the Linden SL viewer version 1.20 (and hopefully onwards) 
         /// </value>
@@ -465,7 +467,7 @@ namespace OpenSim.Framework
                     output.Append(": ");
                 }
 
-                output.Append(CleanString(Encoding.UTF8.GetString(bytes, 0, bytes.Length - 1)));
+                output.Append(CleanString(Util.UTF8.GetString(bytes, 0, bytes.Length - 1)));
             }
             else
             {
@@ -826,7 +828,7 @@ namespace OpenSim.Framework
 
         public static string Compress(string text)
         {
-            byte[] buffer = Encoding.UTF8.GetBytes(text);
+            byte[] buffer = Util.UTF8.GetBytes(text);
             MemoryStream memory = new MemoryStream();
             using (GZipStream compressor = new GZipStream(memory, CompressionMode.Compress, true))
             {
@@ -860,7 +862,7 @@ namespace OpenSim.Framework
                     decompressor.Read(buffer, 0, buffer.Length);
                 }
 
-                return Encoding.UTF8.GetString(buffer);
+                return Util.UTF8.GetString(buffer);
             }
         }
 
@@ -1132,7 +1134,7 @@ namespace OpenSim.Framework
         {
             byte[] data = new byte[length];
             stream.Read(data, 0, length);
-            string strdata = Encoding.UTF8.GetString(data);
+            string strdata = Util.UTF8.GetString(data);
             OSDMap args = null;
             OSD buffer;
             buffer = OSDParser.DeserializeJson(strdata);