diff options
| author | Melanie | 2011-12-08 03:24:25 +0000 |
|---|---|---|
| committer | Melanie | 2011-12-08 03:24:25 +0000 |
| commit | 50aa89dae66246395e9aac4d7d31f010e55473e8 (patch) | |
| tree | b2d23662cc5a51e13f582728bf7064077f9edc32 /OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs | |
| parent | Fix intersim object give messages (diff) | |
| parent | Remove unused SceneManager.TryGetAvatarsScene() (diff) | |
| download | opensim-SC-50aa89dae66246395e9aac4d7d31f010e55473e8.zip opensim-SC-50aa89dae66246395e9aac4d7d31f010e55473e8.tar.gz opensim-SC-50aa89dae66246395e9aac4d7d31f010e55473e8.tar.bz2 opensim-SC-50aa89dae66246395e9aac4d7d31f010e55473e8.tar.xz | |
Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
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. |