aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Capabilities/Caps.cs
diff options
context:
space:
mode:
authorlbsa712007-07-03 14:37:29 +0000
committerlbsa712007-07-03 14:37:29 +0000
commit9b6b6d05d45cf0f754a0b26bf6240ef50be66563 (patch)
tree8d72120aac2184c5ed4c5ab5f6b673ef496a0803 /OpenSim/Region/Capabilities/Caps.cs
parent* Completed conceptual LlsdMethod - everything resides in SimpleApp pending g... (diff)
downloadopensim-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.cs11
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;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Text; 31using System.Text;
32using System.IO; 32using libsecondlife;
33using System.Xml;
34using OpenSim.Framework.Servers; 33using OpenSim.Framework.Servers;
35using OpenSim.Framework;
36using OpenSim.Framework.Utilities;
37using OpenSim.Framework.Types; 34using OpenSim.Framework.Types;
35using OpenSim.Framework.Utilities;
38using OpenSim.Region.Caches; 36using OpenSim.Region.Caches;
39using libsecondlife;
40 37
41namespace OpenSim.Region.Capabilities 38namespace 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;