diff options
| author | Melanie | 2011-12-08 03:37:48 +0100 |
|---|---|---|
| committer | Melanie | 2011-12-08 03:37:48 +0100 |
| commit | 7c7dd6269a0efff5b4619028825a46fcab84de63 (patch) | |
| tree | cbe6c622fc1c069f3a33636fd1174d314dec074a /OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs | |
| parent | Recover from an internal mess-up in the outgoing packet queues by creating (diff) | |
| parent | Merge branch 'master' into bigmerge (diff) | |
| download | opensim-SC-7c7dd6269a0efff5b4619028825a46fcab84de63.zip opensim-SC-7c7dd6269a0efff5b4619028825a46fcab84de63.tar.gz opensim-SC-7c7dd6269a0efff5b4619028825a46fcab84de63.tar.bz2 opensim-SC-7c7dd6269a0efff5b4619028825a46fcab84de63.tar.xz | |
Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs')
| -rw-r--r-- | OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs index fd77984..db58f6f 100644 --- a/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs | |||
| @@ -77,8 +77,8 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 77 | /// true if the handler was successfully registered, false if a handler with the same name already existed. | 77 | /// true if the handler was successfully registered, false if a handler with the same name already existed. |
| 78 | /// </returns> | 78 | /// </returns> |
| 79 | bool AddHTTPHandler(string methodName, GenericHTTPMethod handler); | 79 | bool AddHTTPHandler(string methodName, GenericHTTPMethod handler); |
| 80 | 80 | ||
| 81 | bool AddPollServiceHTTPHandler(string methodName, GenericHTTPMethod handler, PollServiceEventArgs args); | 81 | bool AddPollServiceHTTPHandler(string methodName, PollServiceEventArgs args); |
| 82 | 82 | ||
| 83 | /// <summary> | 83 | /// <summary> |
| 84 | /// Adds a LLSD handler, yay. | 84 | /// Adds a LLSD handler, yay. |