ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 00:46:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

seems to compile ( tests comented out)

Browse Source
This commit is contained in:
UbitUmarov
2015-09-02 19:54:53 +01:00
parent 371c9dd2af
commit a11edceb00
157 changed files with 1315 additions and 9792 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
View File

@@ -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)

19
OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
View File

@@ -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();