aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2013-06-07 23:55:03 +0100
committerMelanie2013-06-07 23:55:03 +0100
commit75631e0267dbf58253dfcf6327b4d65f35bbaa6d (patch)
tree37521359907f2f015c6a51c43db711be16861e0f /OpenSim
parentAdding Avination's PollService to round out the HTTP inventory changes (diff)
downloadopensim-SC_OLD-75631e0267dbf58253dfcf6327b4d65f35bbaa6d.zip
opensim-SC_OLD-75631e0267dbf58253dfcf6327b4d65f35bbaa6d.tar.gz
opensim-SC_OLD-75631e0267dbf58253dfcf6327b4d65f35bbaa6d.tar.bz2
opensim-SC_OLD-75631e0267dbf58253dfcf6327b4d65f35bbaa6d.tar.xz
Supply proper type information for the various types of requests
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs4
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs1
-rw-r--r--OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs12
3 files changed, 8 insertions, 9 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
index c19ac32..3079a7e 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
@@ -52,9 +52,7 @@ namespace OpenSim.Framework.Servers.HttpServer
52 { 52 {
53 Normal = 0, 53 Normal = 0,
54 LslHttp = 1, 54 LslHttp = 1,
55 Inventory = 2, 55 Inventory = 2
56 Texture = 3,
57 Mesh = 4
58 } 56 }
59 57
60 public PollServiceEventArgs( 58 public PollServiceEventArgs(
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
index 7e6b027..9101fc3 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
@@ -288,6 +288,7 @@ namespace OpenSim.Region.ClientStack.Linden
288 // Register this as a poll service 288 // Register this as a poll service
289 PollServiceInventoryEventArgs args = new PollServiceInventoryEventArgs(m_scene, agentID); 289 PollServiceInventoryEventArgs args = new PollServiceInventoryEventArgs(m_scene, agentID);
290 290
291 args.Type = PollServiceEventArgs.EventType.Inventory;
291 MainServer.Instance.AddPollServiceHTTPHandler(capUrl, args); 292 MainServer.Instance.AddPollServiceHTTPHandler(capUrl, args);
292 293
293 string hostName = m_scene.RegionInfo.ExternalHostName; 294 string hostName = m_scene.RegionInfo.ExternalHostName;
diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
index 976ab93..def8162 100644
--- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
@@ -235,9 +235,9 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
235 235
236 string uri = "/lslhttp/" + urlcode.ToString() + "/"; 236 string uri = "/lslhttp/" + urlcode.ToString() + "/";
237 237
238 m_HttpServer.AddPollServiceHTTPHandler( 238 PollServiceEventArgs args = new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, urlcode, 25000);
239 uri, 239 args.Type = PollServiceEventArgs.EventType.LslHttp;
240 new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, urlcode, 25000)); 240 m_HttpServer.AddPollServiceHTTPHandler(uri, args);
241 241
242 m_log.DebugFormat( 242 m_log.DebugFormat(
243 "[URL MODULE]: Set up incoming request url {0} for {1} in {2} {3}", 243 "[URL MODULE]: Set up incoming request url {0} for {1} in {2} {3}",
@@ -280,9 +280,9 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
280 280
281 string uri = "/lslhttps/" + urlcode.ToString() + "/"; 281 string uri = "/lslhttps/" + urlcode.ToString() + "/";
282 282
283 m_HttpsServer.AddPollServiceHTTPHandler( 283 PollServiceEventArgs args = new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, urlcode, 25000);
284 uri, 284 args.Type = PollServiceEventArgs.EventType.LslHttp;
285 new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, urlcode, 25000)); 285 m_HttpsServer.AddPollServiceHTTPHandler(uri, args);
286 286
287 m_log.DebugFormat( 287 m_log.DebugFormat(
288 "[URL MODULE]: Set up incoming secure request url {0} for {1} in {2} {3}", 288 "[URL MODULE]: Set up incoming secure request url {0} for {1} in {2} {3}",