diff options
author | lbsa71 | 2007-07-03 14:37:29 +0000 |
---|---|---|
committer | lbsa71 | 2007-07-03 14:37:29 +0000 |
commit | 9b6b6d05d45cf0f754a0b26bf6240ef50be66563 (patch) | |
tree | 8d72120aac2184c5ed4c5ab5f6b673ef496a0803 /OpenSim/Region/Capabilities/Caps.cs | |
parent | * Completed conceptual LlsdMethod - everything resides in SimpleApp pending g... (diff) | |
download | opensim-SC-9b6b6d05d45cf0f754a0b26bf6240ef50be66563.zip opensim-SC-9b6b6d05d45cf0f754a0b26bf6240ef50be66563.tar.gz opensim-SC-9b6b6d05d45cf0f754a0b26bf6240ef50be66563.tar.bz2 opensim-SC-9b6b6d05d45cf0f754a0b26bf6240ef50be66563.tar.xz |
* Optimized usings (the 'LL ate my scripts' commit)
* added some licensing info
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Capabilities/Caps.cs | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/OpenSim/Region/Capabilities/Caps.cs b/OpenSim/Region/Capabilities/Caps.cs index 2bbf656..b38979d 100644 --- a/OpenSim/Region/Capabilities/Caps.cs +++ b/OpenSim/Region/Capabilities/Caps.cs | |||
@@ -29,14 +29,11 @@ using System; | |||
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.Text; | 31 | using System.Text; |
32 | using System.IO; | 32 | using libsecondlife; |
33 | using System.Xml; | ||
34 | using OpenSim.Framework.Servers; | 33 | using OpenSim.Framework.Servers; |
35 | using OpenSim.Framework; | ||
36 | using OpenSim.Framework.Utilities; | ||
37 | using OpenSim.Framework.Types; | 34 | using OpenSim.Framework.Types; |
35 | using OpenSim.Framework.Utilities; | ||
38 | using OpenSim.Region.Caches; | 36 | using OpenSim.Region.Caches; |
39 | using libsecondlife; | ||
40 | 37 | ||
41 | namespace OpenSim.Region.Capabilities | 38 | namespace OpenSim.Region.Capabilities |
42 | { | 39 | { |
@@ -126,7 +123,7 @@ namespace OpenSim.Region.Capabilities | |||
126 | /// <returns></returns> | 123 | /// <returns></returns> |
127 | public string MapLayer(string request, string path, string param) | 124 | public string MapLayer(string request, string path, string param) |
128 | { | 125 | { |
129 | Encoding _enc = System.Text.Encoding.UTF8; | 126 | Encoding _enc = Encoding.UTF8; |
130 | Hashtable hash =(Hashtable) LLSD.LLSDDeserialize(_enc.GetBytes(request)); | 127 | Hashtable hash =(Hashtable) LLSD.LLSDDeserialize(_enc.GetBytes(request)); |
131 | LLSDMapRequest mapReq = new LLSDMapRequest(); | 128 | LLSDMapRequest mapReq = new LLSDMapRequest(); |
132 | LLSDHelpers.DeserialiseLLSDMap(hash, mapReq ); | 129 | LLSDHelpers.DeserialiseLLSDMap(hash, mapReq ); |
@@ -252,7 +249,7 @@ namespace OpenSim.Region.Capabilities | |||
252 | 249 | ||
253 | public string uploaderCaps(string request, string path, string param) | 250 | public string uploaderCaps(string request, string path, string param) |
254 | { | 251 | { |
255 | Encoding _enc = System.Text.Encoding.UTF8; | 252 | Encoding _enc = Encoding.UTF8; |
256 | byte[] data = _enc.GetBytes(request); | 253 | byte[] data = _enc.GetBytes(request); |
257 | //Console.WriteLine("recieved upload " + Util.FieldToString(data)); | 254 | //Console.WriteLine("recieved upload " + Util.FieldToString(data)); |
258 | LLUUID inv = this.inventoryItemID; | 255 | LLUUID inv = this.inventoryItemID; |