diff options
| author | Melanie | 2010-03-15 17:23:35 +0000 |
|---|---|---|
| committer | Melanie | 2010-03-15 17:23:35 +0000 |
| commit | d3f33acc1a6a385ee19814286fe27cb5e48c1551 (patch) | |
| tree | 07795e74a637ca63d96b5ee06950b8c1a7a99489 /OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |
| parent | Merge branch 'careminster' into careminster-presence-refactor (diff) | |
| parent | flip UVs for profile faces (diff) | |
| download | opensim-SC-d3f33acc1a6a385ee19814286fe27cb5e48c1551.zip opensim-SC-d3f33acc1a6a385ee19814286fe27cb5e48c1551.tar.gz opensim-SC-d3f33acc1a6a385ee19814286fe27cb5e48c1551.tar.bz2 opensim-SC-d3f33acc1a6a385ee19814286fe27cb5e48c1551.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index 214f936..9a6ef77 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
| @@ -202,16 +202,14 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 202 | if (!m_pollHandlers.ContainsKey(methodName)) | 202 | if (!m_pollHandlers.ContainsKey(methodName)) |
| 203 | { | 203 | { |
| 204 | m_pollHandlers.Add(methodName,args); | 204 | m_pollHandlers.Add(methodName,args); |
| 205 | pollHandlerResult = true; | 205 | pollHandlerResult = true; |
| 206 | |||
| 207 | } | 206 | } |
| 208 | } | 207 | } |
| 209 | 208 | ||
| 210 | if (pollHandlerResult) | 209 | if (pollHandlerResult) |
| 211 | return AddHTTPHandler(methodName, handler); | 210 | return AddHTTPHandler(methodName, handler); |
| 212 | 211 | ||
| 213 | return false; | 212 | return false; |
| 214 | |||
| 215 | } | 213 | } |
| 216 | 214 | ||
| 217 | // Note that the agent string is provided simply to differentiate | 215 | // Note that the agent string is provided simply to differentiate |