2 files changed, 5 insertions, 28 deletions

diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
index 235fbbb..c0faad8 100644
--- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
+++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
@@ -358,9 +358,8 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
             m_proxyurl = config.Configs["Startup"].GetString("HttpProxy");
             m_proxyexcepts = config.Configs["Startup"].GetString("HttpProxyExceptions");
 
-<<<<<<< HEAD
+
             m_outboundUrlFilter = new OutboundUrlFilter("Script HTTP request module", config);
-=======
             int maxThreads = 15;
 
             IConfig httpConfig = config.Configs["HttpRequestModule"];
@@ -368,7 +367,6 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
             {
                 maxThreads = httpConfig.GetInt("MaxPoolThreads", maxThreads);
             }
->>>>>>> avn/ubitvar
 
             m_pendingRequests = new Dictionary<UUID, HttpRequestClass>();
 
@@ -532,16 +530,12 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
 
             try
             {
-<<<<<<< HEAD
                 Request = (HttpWebRequest)WebRequest.Create(Url);
                 Request.AllowAutoRedirect = false;               
-=======
-                Request = (HttpWebRequest) WebRequest.Create(Url);
 
                 //This works around some buggy HTTP Servers like Lighttpd
                 Request.ServicePoint.Expect100Continue = false;
 
->>>>>>> avn/ubitvar
                 Request.Method = HttpMethod;
                 Request.ContentType = HttpMIMEType;
 
@@ -646,7 +640,8 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
                     {
                         using (Stream responseStream = webRsp.GetResponseStream())
                         {
-                            ResponseBody = responseStream.GetStreamString();
+                            using (StreamReader reader = new StreamReader(responseStream))
+                                ResponseBody = reader.ReadToEnd();
                         }
                     }
                     catch
@@ -676,7 +671,6 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
                     resStream.Close();
                 if (response != null)
                     response.Close();
-<<<<<<< HEAD
 
                 // We need to resubmit 
                 if (
@@ -724,8 +718,6 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
                 {
                     _finished = true;
                 }
-=======
->>>>>>> avn/ubitvar
             }
 
             if (ResponseBody == null)
diff --git a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
index 1c3a714..93a4f09 100644
--- a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
@@ -380,28 +380,13 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
 
             if (sp != null)
             {
-<<<<<<< HEAD
-                // ignore if a child agent this is restricted to inside one
-                // region
-                if (sp.IsChildAgent)
-                    return;
-
-                // Channel zero only goes to the avatar
-                // non zero channel messages only go to the attachments of the avatar.
-                if (channel != 0)
-                {
-                    List<SceneObjectGroup> attachments = sp.GetAttachments();
-                    if (attachments.Count == 0)
-                        return;
-=======
-                // Send message to avatar
+                 // Send message to avatar
                 if (channel == 0)
                 {
-                    // Channel 0 goes to viewer ONLY
+                   // Channel 0 goes to viewer ONLY
                     m_scene.SimChat(Utils.StringToBytes(msg), ChatTypeEnum.Broadcast, 0, pos, name, id, target, false, false);
                     return true;
                 }
->>>>>>> avn/ubitvar
 
                 List<SceneObjectGroup> attachments = sp.GetAttachments();