diff options
Diffstat (limited to 'OpenSim/Region/Capabilities/Caps.cs')
-rw-r--r-- | OpenSim/Region/Capabilities/Caps.cs | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Region/Capabilities/Caps.cs b/OpenSim/Region/Capabilities/Caps.cs index fdc21cf..6068076 100644 --- a/OpenSim/Region/Capabilities/Caps.cs +++ b/OpenSim/Region/Capabilities/Caps.cs | |||
@@ -74,10 +74,10 @@ namespace OpenSim.Region.Capabilities | |||
74 | string capsBase = "/CAPS/" + m_capsObjectPath; | 74 | string capsBase = "/CAPS/" + m_capsObjectPath; |
75 | 75 | ||
76 | 76 | ||
77 | AddLegacyCapsHandler( httpListener, m_mapLayerPath, MapLayer); | 77 | //AddLegacyCapsHandler( httpListener, m_mapLayerPath, MapLayer); |
78 | 78 | ||
79 | //httpListener.AddStreamHandler( | 79 | httpListener.AddStreamHandler( |
80 | // new LLSDStreamhandler<LLSDMapRequest, LLSDMapLayerResponse>("POST", capsBase + m_mapLayerPath, this.GetMapLayer )); | 80 | new LLSDStreamhandler<LLSDMapRequest, LLSDMapLayerResponse>("POST", capsBase + m_mapLayerPath, this.GetMapLayer )); |
81 | 81 | ||
82 | AddLegacyCapsHandler(httpListener, m_requestPath, CapsRequest); | 82 | AddLegacyCapsHandler(httpListener, m_requestPath, CapsRequest); |
83 | AddLegacyCapsHandler(httpListener, m_newInventory, NewAgentInventory); | 83 | AddLegacyCapsHandler(httpListener, m_newInventory, NewAgentInventory); |
@@ -86,13 +86,6 @@ namespace OpenSim.Region.Capabilities | |||
86 | 86 | ||
87 | } | 87 | } |
88 | 88 | ||
89 | public LLSDMapLayerResponse GetMapLayer(LLSDMapRequest mapReq) | ||
90 | { | ||
91 | LLSDMapLayerResponse mapResponse = new LLSDMapLayerResponse(); | ||
92 | mapResponse.LayerData.Array.Add(this.BuildLLSDMapLayerResponse()); | ||
93 | return mapResponse; | ||
94 | } | ||
95 | |||
96 | [Obsolete("Use BaseHttpServer.AddStreamHandler(new LLSDStreamHandler( LLSDMethod delegate )) instead.")] | 89 | [Obsolete("Use BaseHttpServer.AddStreamHandler(new LLSDStreamHandler( LLSDMethod delegate )) instead.")] |
97 | private void AddLegacyCapsHandler(BaseHttpServer httpListener, string path, RestMethod restMethod) | 90 | private void AddLegacyCapsHandler(BaseHttpServer httpListener, string path, RestMethod restMethod) |
98 | { | 91 | { |
@@ -151,6 +144,13 @@ namespace OpenSim.Region.Capabilities | |||
151 | return res; | 144 | return res; |
152 | } | 145 | } |
153 | 146 | ||
147 | public LLSDMapLayerResponse GetMapLayer(LLSDMapRequest mapReq) | ||
148 | { | ||
149 | LLSDMapLayerResponse mapResponse = new LLSDMapLayerResponse(); | ||
150 | mapResponse.LayerData.Array.Add(this.BuildLLSDMapLayerResponse()); | ||
151 | return mapResponse; | ||
152 | } | ||
153 | |||
154 | 154 | ||
155 | /// <summary> | 155 | /// <summary> |
156 | /// | 156 | /// |