Merge branch 'avination' into careminster

Conflicts: OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs
author: Melanie 2012-07-16 22:22:42 +0100
committer: Melanie 2012-07-16 22:22:42 +0100
commit: c256447f46db1738131763960c9394f03b072c46 (patch)
tree: 277255a693b3ce62366816338482a602d7d979bf /OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
parent: Merge branch 'master' into careminster (diff)
parent: Allow setting linked avatar positions from within a prim not the one sat on (diff)
download: opensim-SC_OLD-c256447f46db1738131763960c9394f03b072c46.zip
opensim-SC_OLD-c256447f46db1738131763960c9394f03b072c46.tar.gz
opensim-SC_OLD-c256447f46db1738131763960c9394f03b072c46.tar.bz2
opensim-SC_OLD-c256447f46db1738131763960c9394f03b072c46.tar.xz
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
index 7f2f147..f4a89bd 100644
--- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
@@ -215,7 +215,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                    engine.PostScriptEvent(itemID, "http_request", new Object[] { urlcode.ToString(), "URL_REQUEST_DENIED", "" });
                    return urlcode;
                }
-                string url = "https://" + m_ExternalHostNameForLSL + ":" + m_HttpsServer.Port.ToString() + "/lslhttps/" + urlcode.ToString() + "/";
+                string url = "https://" + m_ExternalHostNameForLSL + ":" + m_HttpsServer.Port.ToString() + "/lslhttps/" + urlcode.ToString();
                UrlData urlData = new UrlData();
                urlData.hostID = host.UUID;
@@ -228,11 +228,11 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                
                m_UrlMap[url] = urlData;
                
-                string uri = "/lslhttps/" + urlcode.ToString() + "/";
+                string uri = "/lslhttps/" + urlcode.ToString();
               
-                m_HttpsServer.AddPollServiceHTTPHandler(
+                PollServiceEventArgs args = new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, urlcode, 25000);
-                    uri,
+                args.Type = PollServiceEventArgs.EventType.LslHttp;
-                    new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, urlcode,25000));
+                m_HttpsServer.AddPollServiceHTTPHandler(uri, args);
                m_log.DebugFormat(
                    "[URL MODULE]: Set up incoming secure request url {0} for {1} in {2} {3}",
author	Melanie	2012-07-16 22:22:42 +0100
committer	Melanie	2012-07-16 22:22:42 +0100
commit	c256447f46db1738131763960c9394f03b072c46 (patch)
tree	277255a693b3ce62366816338482a602d7d979bf /OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
parent	Merge branch 'master' into careminster (diff)
parent	Allow setting linked avatar positions from within a prim not the one sat on (diff)
download	opensim-SC_OLD-c256447f46db1738131763960c9394f03b072c46.zip opensim-SC_OLD-c256447f46db1738131763960c9394f03b072c46.tar.gz opensim-SC_OLD-c256447f46db1738131763960c9394f03b072c46.tar.bz2 opensim-SC_OLD-c256447f46db1738131763960c9394f03b072c46.tar.xz

diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs index 7f2f147..f4a89bd 100644 --- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
@@ -215,7 +215,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
215	engine.PostScriptEvent(itemID, "http_request", new Object[] { urlcode.ToString(), "URL_REQUEST_DENIED", "" });	215	engine.PostScriptEvent(itemID, "http_request", new Object[] { urlcode.ToString(), "URL_REQUEST_DENIED", "" });
216	return urlcode;	216	return urlcode;
217	}	217	}
218	string url = "https://" + m_ExternalHostNameForLSL + ":" + m_HttpsServer.Port.ToString() + "/lslhttps/" + urlcode.ToString() + "/";	218	string url = "https://" + m_ExternalHostNameForLSL + ":" + m_HttpsServer.Port.ToString() + "/lslhttps/" + urlcode.ToString();
219		219
220	UrlData urlData = new UrlData();	220	UrlData urlData = new UrlData();
221	urlData.hostID = host.UUID;	221	urlData.hostID = host.UUID;
@@ -228,11 +228,11 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
228		228
229	m_UrlMap[url] = urlData;	229	m_UrlMap[url] = urlData;
230		230
231	string uri = "/lslhttps/" + urlcode.ToString() + "/";	231	string uri = "/lslhttps/" + urlcode.ToString();
232		232
233	m_HttpsServer.AddPollServiceHTTPHandler(	233	PollServiceEventArgs args = new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, urlcode, 25000);
234	uri,	234	args.Type = PollServiceEventArgs.EventType.LslHttp;
235	new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, urlcode,25000));	235	m_HttpsServer.AddPollServiceHTTPHandler(uri, args);
236		236
237	m_log.DebugFormat(	237	m_log.DebugFormat(
238	"[URL MODULE]: Set up incoming secure request url {0} for {1} in {2} {3}",	238	"[URL MODULE]: Set up incoming secure request url {0} for {1} in {2} {3}",