diff options
| author | teravus | 2013-10-05 17:36:58 -0500 |
|---|---|---|
| committer | teravus | 2013-10-05 17:36:58 -0500 |
| commit | ece2d24077cacba677de5cebdd3a9da463306ecd (patch) | |
| tree | 9f85591639a2f039b52f869be371b1f3c4363b37 /OpenSim/Framework/Servers | |
| parent | Merge branch 'master' of careminster:/var/git/careminster (diff) | |
| download | opensim-SC-ece2d24077cacba677de5cebdd3a9da463306ecd.zip opensim-SC-ece2d24077cacba677de5cebdd3a9da463306ecd.tar.gz opensim-SC-ece2d24077cacba677de5cebdd3a9da463306ecd.tar.bz2 opensim-SC-ece2d24077cacba677de5cebdd3a9da463306ecd.tar.xz | |
* Fixes cases where Last Attachment Point gets overwritten with 0 when it shouldn't
* Fixes cases where Last Attachment Point doesn't get written when it should.
* Fixes Null Reference in BaseHttpServer when shutting down, null path provided.
* Drop then Wear retains Last Attachment Point
Diffstat (limited to 'OpenSim/Framework/Servers')
| -rw-r--r-- | OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index ed733cf..5681ece 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
| @@ -1967,6 +1967,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 1967 | 1967 | ||
| 1968 | public void RemoveHTTPHandler(string httpMethod, string path) | 1968 | public void RemoveHTTPHandler(string httpMethod, string path) |
| 1969 | { | 1969 | { |
| 1970 | if (path == null) return; // Caps module isn't loaded, tries to remove handler where path = null | ||
| 1970 | lock (m_HTTPHandlers) | 1971 | lock (m_HTTPHandlers) |
| 1971 | { | 1972 | { |
| 1972 | if (httpMethod != null && httpMethod.Length == 0) | 1973 | if (httpMethod != null && httpMethod.Length == 0) |