diff options
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | 53 |
1 files changed, 42 insertions, 11 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs index ef6dedb..d397893 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | |||
@@ -158,7 +158,9 @@ namespace OpenSim.Region.ClientStack.Linden | |||
158 | try | 158 | try |
159 | { | 159 | { |
160 | // the root of all evil | 160 | // the root of all evil |
161 | m_HostCapsObj.RegisterHandler("SEED", new RestStreamHandler("POST", capsBase + m_requestPath, SeedCapRequest)); | 161 | m_HostCapsObj.RegisterHandler( |
162 | "SEED", new RestStreamHandler("POST", capsBase + m_requestPath, SeedCapRequest, "SEED", null)); | ||
163 | |||
162 | m_log.DebugFormat( | 164 | m_log.DebugFormat( |
163 | "[CAPS]: Registered seed capability {0} for {1}", capsBase + m_requestPath, m_HostCapsObj.AgentID); | 165 | "[CAPS]: Registered seed capability {0} for {1}", capsBase + m_requestPath, m_HostCapsObj.AgentID); |
164 | 166 | ||
@@ -166,7 +168,10 @@ namespace OpenSim.Region.ClientStack.Linden | |||
166 | // new LLSDStreamhandler<OSDMapRequest, OSDMapLayerResponse>("POST", | 168 | // new LLSDStreamhandler<OSDMapRequest, OSDMapLayerResponse>("POST", |
167 | // capsBase + m_mapLayerPath, | 169 | // capsBase + m_mapLayerPath, |
168 | // GetMapLayer); | 170 | // GetMapLayer); |
169 | IRequestHandler req = new RestStreamHandler("POST", capsBase + m_notecardTaskUpdatePath, ScriptTaskInventory); | 171 | IRequestHandler req |
172 | = new RestStreamHandler( | ||
173 | "POST", capsBase + m_notecardTaskUpdatePath, ScriptTaskInventory, "UpdateScript", null); | ||
174 | |||
170 | m_HostCapsObj.RegisterHandler("UpdateScriptTaskInventory", req); | 175 | m_HostCapsObj.RegisterHandler("UpdateScriptTaskInventory", req); |
171 | m_HostCapsObj.RegisterHandler("UpdateScriptTask", req); | 176 | m_HostCapsObj.RegisterHandler("UpdateScriptTask", req); |
172 | } | 177 | } |
@@ -181,14 +186,22 @@ namespace OpenSim.Region.ClientStack.Linden | |||
181 | try | 186 | try |
182 | { | 187 | { |
183 | // I don't think this one works... | 188 | // I don't think this one works... |
184 | m_HostCapsObj.RegisterHandler("NewFileAgentInventory", new LLSDStreamhandler<LLSDAssetUploadRequest, LLSDAssetUploadResponse>("POST", | 189 | m_HostCapsObj.RegisterHandler( |
185 | capsBase + m_newInventory, | 190 | "NewFileAgentInventory", |
186 | NewAgentInventoryRequest)); | 191 | new LLSDStreamhandler<LLSDAssetUploadRequest, LLSDAssetUploadResponse>( |
187 | IRequestHandler req = new RestStreamHandler("POST", capsBase + m_notecardUpdatePath, NoteCardAgentInventory); | 192 | "POST", |
193 | capsBase + m_newInventory, | ||
194 | NewAgentInventoryRequest, | ||
195 | "NewFileAgentInventory", | ||
196 | null)); | ||
197 | |||
198 | IRequestHandler req | ||
199 | = new RestStreamHandler( | ||
200 | "POST", capsBase + m_notecardUpdatePath, NoteCardAgentInventory, "Update*", null); | ||
201 | |||
188 | m_HostCapsObj.RegisterHandler("UpdateNotecardAgentInventory", req); | 202 | m_HostCapsObj.RegisterHandler("UpdateNotecardAgentInventory", req); |
189 | m_HostCapsObj.RegisterHandler("UpdateScriptAgentInventory", req); | 203 | m_HostCapsObj.RegisterHandler("UpdateScriptAgentInventory", req); |
190 | m_HostCapsObj.RegisterHandler("UpdateScriptAgent", req); | 204 | m_HostCapsObj.RegisterHandler("UpdateScriptAgent", req); |
191 | m_HostCapsObj.RegisterHandler("CopyInventoryFromNotecard", new RestStreamHandler("POST", capsBase + m_copyFromNotecardPath, CopyInventoryFromNotecard)); | ||
192 | IRequestHandler getObjectPhysicsDataHandler = new RestStreamHandler("POST", capsBase + m_getObjectPhysicsDataPath, GetObjectPhysicsData); | 205 | IRequestHandler getObjectPhysicsDataHandler = new RestStreamHandler("POST", capsBase + m_getObjectPhysicsDataPath, GetObjectPhysicsData); |
193 | m_HostCapsObj.RegisterHandler("GetObjectPhysicsData", getObjectPhysicsDataHandler); | 206 | m_HostCapsObj.RegisterHandler("GetObjectPhysicsData", getObjectPhysicsDataHandler); |
194 | IRequestHandler getObjectCostHandler = new RestStreamHandler("POST", capsBase + m_getObjectCostPath, GetObjectCost); | 207 | IRequestHandler getObjectCostHandler = new RestStreamHandler("POST", capsBase + m_getObjectCostPath, GetObjectCost); |
@@ -197,6 +210,12 @@ namespace OpenSim.Region.ClientStack.Linden | |||
197 | m_HostCapsObj.RegisterHandler("ResourceCostSelected", ResourceCostSelectedHandler); | 210 | m_HostCapsObj.RegisterHandler("ResourceCostSelected", ResourceCostSelectedHandler); |
198 | 211 | ||
199 | 212 | ||
213 | |||
214 | m_HostCapsObj.RegisterHandler( | ||
215 | "CopyInventoryFromNotecard", | ||
216 | new RestStreamHandler( | ||
217 | "POST", capsBase + m_copyFromNotecardPath, CopyInventoryFromNotecard, "CopyInventoryFromNotecard", null)); | ||
218 | |||
200 | // As of RC 1.22.9 of the Linden client this is | 219 | // As of RC 1.22.9 of the Linden client this is |
201 | // supported | 220 | // supported |
202 | 221 | ||
@@ -245,7 +264,10 @@ namespace OpenSim.Region.ClientStack.Linden | |||
245 | 264 | ||
246 | if (!m_Scene.CheckClient(m_HostCapsObj.AgentID, httpRequest.RemoteIPEndPoint)) | 265 | if (!m_Scene.CheckClient(m_HostCapsObj.AgentID, httpRequest.RemoteIPEndPoint)) |
247 | { | 266 | { |
248 | m_log.DebugFormat("[CAPS]: Unauthorized CAPS client"); | 267 | m_log.DebugFormat( |
268 | "[CAPS]: Unauthorized CAPS client {0} from {1}", | ||
269 | m_HostCapsObj.AgentID, httpRequest.RemoteIPEndPoint); | ||
270 | |||
249 | return string.Empty; | 271 | return string.Empty; |
250 | } | 272 | } |
251 | 273 | ||
@@ -296,7 +318,9 @@ namespace OpenSim.Region.ClientStack.Linden | |||
296 | m_dumpAssetsToFile); | 318 | m_dumpAssetsToFile); |
297 | uploader.OnUpLoad += TaskScriptUpdated; | 319 | uploader.OnUpLoad += TaskScriptUpdated; |
298 | 320 | ||
299 | m_HostCapsObj.HttpListener.AddStreamHandler(new BinaryStreamHandler("POST", capsBase + uploaderPath, uploader.uploaderCaps)); | 321 | m_HostCapsObj.HttpListener.AddStreamHandler( |
322 | new BinaryStreamHandler( | ||
323 | "POST", capsBase + uploaderPath, uploader.uploaderCaps, "TaskInventoryScriptUpdater", null)); | ||
300 | 324 | ||
301 | string protocol = "http://"; | 325 | string protocol = "http://"; |
302 | 326 | ||
@@ -423,8 +447,14 @@ namespace OpenSim.Region.ClientStack.Linden | |||
423 | AssetUploader uploader = | 447 | AssetUploader uploader = |
424 | new AssetUploader(assetName, assetDes, newAsset, newInvItem, parentFolder, llsdRequest.inventory_type, | 448 | new AssetUploader(assetName, assetDes, newAsset, newInvItem, parentFolder, llsdRequest.inventory_type, |
425 | llsdRequest.asset_type, capsBase + uploaderPath, m_HostCapsObj.HttpListener, m_dumpAssetsToFile); | 449 | llsdRequest.asset_type, capsBase + uploaderPath, m_HostCapsObj.HttpListener, m_dumpAssetsToFile); |
450 | |||
426 | m_HostCapsObj.HttpListener.AddStreamHandler( | 451 | m_HostCapsObj.HttpListener.AddStreamHandler( |
427 | new BinaryStreamHandler("POST", capsBase + uploaderPath, uploader.uploaderCaps)); | 452 | new BinaryStreamHandler( |
453 | "POST", | ||
454 | capsBase + uploaderPath, | ||
455 | uploader.uploaderCaps, | ||
456 | "NewAgentInventoryRequest", | ||
457 | m_HostCapsObj.AgentID.ToString())); | ||
428 | 458 | ||
429 | string protocol = "http://"; | 459 | string protocol = "http://"; |
430 | 460 | ||
@@ -740,7 +770,8 @@ namespace OpenSim.Region.ClientStack.Linden | |||
740 | uploader.OnUpLoad += ItemUpdated; | 770 | uploader.OnUpLoad += ItemUpdated; |
741 | 771 | ||
742 | m_HostCapsObj.HttpListener.AddStreamHandler( | 772 | m_HostCapsObj.HttpListener.AddStreamHandler( |
743 | new BinaryStreamHandler("POST", capsBase + uploaderPath, uploader.uploaderCaps)); | 773 | new BinaryStreamHandler( |
774 | "POST", capsBase + uploaderPath, uploader.uploaderCaps, "NoteCardAgentInventory", null)); | ||
744 | 775 | ||
745 | string protocol = "http://"; | 776 | string protocol = "http://"; |
746 | 777 | ||