Merge branch 'avination' into ubitwork

1 files changed, 6 insertions, 4 deletions

diff --git a/OpenSim/Capabilities/LLSDStreamHandler.cs b/OpenSim/Capabilities/LLSDStreamHandler.cs
index c7c1fc9..5df24b2 100644
--- a/OpenSim/Capabilities/LLSDStreamHandler.cs
+++ b/OpenSim/Capabilities/LLSDStreamHandler.cs
@@ -39,7 +39,11 @@ namespace OpenSim.Framework.Capabilities
         private LLSDMethod<TRequest, TResponse> m_method;
 
         public LLSDStreamhandler(string httpMethod, string path, LLSDMethod<TRequest, TResponse> method)
-            : base(httpMethod, path)
+            : this(httpMethod, path, method, null, null) {}
+
+        public LLSDStreamhandler(
+            string httpMethod, string path, LLSDMethod<TRequest, TResponse> method, string name, string description)
+            : base(httpMethod, path, name, description)
         {
             m_method = method;
         }
@@ -62,9 +66,7 @@ namespace OpenSim.Framework.Capabilities
 
             TResponse response = m_method(llsdRequest);
 
-            Encoding encoding = new UTF8Encoding(false);
-
-            return encoding.GetBytes(LLSDHelpers.SerialiseLLSDReply(response));
+            return Util.UTF8NoBomEncoding.GetBytes(LLSDHelpers.SerialiseLLSDReply(response));
         }
     }
 }