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 | |
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 'OpenSim/Region/Capabilities')
-rw-r--r-- | OpenSim/Region/Capabilities/Caps.cs | 11 | ||||
-rw-r--r-- | OpenSim/Region/Capabilities/LLSDArray.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/Capabilities/LLSDCapEvent.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Capabilities/LLSDCapsDetails.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Capabilities/LLSDEmpty.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Capabilities/LLSDHelpers.cs | 9 | ||||
-rw-r--r-- | OpenSim/Region/Capabilities/LLSDMapLayer.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Capabilities/LLSDMapLayerResponse.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Capabilities/LLSDMapRequest.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Capabilities/LLSDTest.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Capabilities/LLSDType.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Capabilities/LLSDUploadReply.cs | 5 |
12 files changed, 9 insertions, 49 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; |
diff --git a/OpenSim/Region/Capabilities/LLSDArray.cs b/OpenSim/Region/Capabilities/LLSDArray.cs index 76d5a2c..e04849f 100644 --- a/OpenSim/Region/Capabilities/LLSDArray.cs +++ b/OpenSim/Region/Capabilities/LLSDArray.cs | |||
@@ -25,10 +25,7 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | using System; | ||
29 | using System.Collections; | 28 | using System.Collections; |
30 | using System.Collections.Generic; | ||
31 | using System.Text; | ||
32 | 29 | ||
33 | namespace OpenSim.Region.Capabilities | 30 | namespace OpenSim.Region.Capabilities |
34 | { | 31 | { |
diff --git a/OpenSim/Region/Capabilities/LLSDCapEvent.cs b/OpenSim/Region/Capabilities/LLSDCapEvent.cs index d47d25c..51b4fe0 100644 --- a/OpenSim/Region/Capabilities/LLSDCapEvent.cs +++ b/OpenSim/Region/Capabilities/LLSDCapEvent.cs | |||
@@ -25,10 +25,6 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | |||
32 | namespace OpenSim.Region.Capabilities | 28 | namespace OpenSim.Region.Capabilities |
33 | { | 29 | { |
34 | [LLSDType("MAP")] | 30 | [LLSDType("MAP")] |
diff --git a/OpenSim/Region/Capabilities/LLSDCapsDetails.cs b/OpenSim/Region/Capabilities/LLSDCapsDetails.cs index d6db606..1522559 100644 --- a/OpenSim/Region/Capabilities/LLSDCapsDetails.cs +++ b/OpenSim/Region/Capabilities/LLSDCapsDetails.cs | |||
@@ -1,7 +1,3 @@ | |||
1 | using System; | ||
2 | using System.Collections.Generic; | ||
3 | using System.Text; | ||
4 | |||
5 | namespace OpenSim.Region.Capabilities | 1 | namespace OpenSim.Region.Capabilities |
6 | { | 2 | { |
7 | [LLSDType("MAP")] | 3 | [LLSDType("MAP")] |
diff --git a/OpenSim/Region/Capabilities/LLSDEmpty.cs b/OpenSim/Region/Capabilities/LLSDEmpty.cs index 68f1ce9..d79c09e 100644 --- a/OpenSim/Region/Capabilities/LLSDEmpty.cs +++ b/OpenSim/Region/Capabilities/LLSDEmpty.cs | |||
@@ -25,10 +25,6 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | |||
32 | namespace OpenSim.Region.Capabilities | 28 | namespace OpenSim.Region.Capabilities |
33 | { | 29 | { |
34 | [LLSDType("MAP")] | 30 | [LLSDType("MAP")] |
diff --git a/OpenSim/Region/Capabilities/LLSDHelpers.cs b/OpenSim/Region/Capabilities/LLSDHelpers.cs index 76d9345..19ef0c9 100644 --- a/OpenSim/Region/Capabilities/LLSDHelpers.cs +++ b/OpenSim/Region/Capabilities/LLSDHelpers.cs | |||
@@ -27,9 +27,8 @@ | |||
27 | */ | 27 | */ |
28 | using System; | 28 | using System; |
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Collections.Generic; | ||
31 | using System.Text; | ||
32 | using System.IO; | 30 | using System.IO; |
31 | using System.Reflection; | ||
33 | using System.Xml; | 32 | using System.Xml; |
34 | using libsecondlife; | 33 | using libsecondlife; |
35 | 34 | ||
@@ -43,7 +42,7 @@ namespace OpenSim.Region.Capabilities | |||
43 | XmlTextWriter writer = new XmlTextWriter(sw); | 42 | XmlTextWriter writer = new XmlTextWriter(sw); |
44 | writer.Formatting = Formatting.None; | 43 | writer.Formatting = Formatting.None; |
45 | writer.WriteStartElement(String.Empty, "llsd", String.Empty); | 44 | writer.WriteStartElement(String.Empty, "llsd", String.Empty); |
46 | LLSDHelpers.SerializeLLSDType(writer, obj); | 45 | SerializeLLSDType(writer, obj); |
47 | writer.WriteEndElement(); | 46 | writer.WriteEndElement(); |
48 | writer.Close(); | 47 | writer.Close(); |
49 | return sw.ToString(); | 48 | return sw.ToString(); |
@@ -59,7 +58,7 @@ namespace OpenSim.Region.Capabilities | |||
59 | { | 58 | { |
60 | case "MAP": | 59 | case "MAP": |
61 | writer.WriteStartElement(String.Empty, "map", String.Empty); | 60 | writer.WriteStartElement(String.Empty, "map", String.Empty); |
62 | System.Reflection.FieldInfo[] fields = myType.GetFields(); | 61 | FieldInfo[] fields = myType.GetFields(); |
63 | for (int i = 0; i < fields.Length; i++) | 62 | for (int i = 0; i < fields.Length; i++) |
64 | { | 63 | { |
65 | object fieldValue = fields[i].GetValue(obj); | 64 | object fieldValue = fields[i].GetValue(obj); |
@@ -115,7 +114,7 @@ namespace OpenSim.Region.Capabilities | |||
115 | IDictionaryEnumerator enumerator = llsd.GetEnumerator(); | 114 | IDictionaryEnumerator enumerator = llsd.GetEnumerator(); |
116 | while (enumerator.MoveNext()) | 115 | while (enumerator.MoveNext()) |
117 | { | 116 | { |
118 | System.Reflection.FieldInfo field = myType.GetField((string)enumerator.Key); | 117 | FieldInfo field = myType.GetField((string)enumerator.Key); |
119 | if (field != null) | 118 | if (field != null) |
120 | { | 119 | { |
121 | if (enumerator.Value is Hashtable) | 120 | if (enumerator.Value is Hashtable) |
diff --git a/OpenSim/Region/Capabilities/LLSDMapLayer.cs b/OpenSim/Region/Capabilities/LLSDMapLayer.cs index b097ec3..566d0e9 100644 --- a/OpenSim/Region/Capabilities/LLSDMapLayer.cs +++ b/OpenSim/Region/Capabilities/LLSDMapLayer.cs | |||
@@ -25,10 +25,6 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | |||
32 | using libsecondlife; | 28 | using libsecondlife; |
33 | 29 | ||
34 | namespace OpenSim.Region.Capabilities | 30 | namespace OpenSim.Region.Capabilities |
diff --git a/OpenSim/Region/Capabilities/LLSDMapLayerResponse.cs b/OpenSim/Region/Capabilities/LLSDMapLayerResponse.cs index ee37a5b..ce746ae 100644 --- a/OpenSim/Region/Capabilities/LLSDMapLayerResponse.cs +++ b/OpenSim/Region/Capabilities/LLSDMapLayerResponse.cs | |||
@@ -25,10 +25,6 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | |||
32 | namespace OpenSim.Region.Capabilities | 28 | namespace OpenSim.Region.Capabilities |
33 | { | 29 | { |
34 | [LLSDType("MAP")] | 30 | [LLSDType("MAP")] |
diff --git a/OpenSim/Region/Capabilities/LLSDMapRequest.cs b/OpenSim/Region/Capabilities/LLSDMapRequest.cs index b15f1be..fb739cd 100644 --- a/OpenSim/Region/Capabilities/LLSDMapRequest.cs +++ b/OpenSim/Region/Capabilities/LLSDMapRequest.cs | |||
@@ -1,7 +1,3 @@ | |||
1 | using System; | ||
2 | using System.Collections.Generic; | ||
3 | using System.Text; | ||
4 | |||
5 | namespace OpenSim.Region.Capabilities | 1 | namespace OpenSim.Region.Capabilities |
6 | { | 2 | { |
7 | [LLSDType("MAP")] | 3 | [LLSDType("MAP")] |
diff --git a/OpenSim/Region/Capabilities/LLSDTest.cs b/OpenSim/Region/Capabilities/LLSDTest.cs index 3948f2c..f23e327 100644 --- a/OpenSim/Region/Capabilities/LLSDTest.cs +++ b/OpenSim/Region/Capabilities/LLSDTest.cs | |||
@@ -25,10 +25,6 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | |||
32 | namespace OpenSim.Region.Capabilities | 28 | namespace OpenSim.Region.Capabilities |
33 | { | 29 | { |
34 | [LLSDType("MAP")] | 30 | [LLSDType("MAP")] |
diff --git a/OpenSim/Region/Capabilities/LLSDType.cs b/OpenSim/Region/Capabilities/LLSDType.cs index a2ae8df..c58a937 100644 --- a/OpenSim/Region/Capabilities/LLSDType.cs +++ b/OpenSim/Region/Capabilities/LLSDType.cs | |||
@@ -26,8 +26,6 @@ | |||
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | 29 | ||
32 | namespace OpenSim.Region.Capabilities | 30 | namespace OpenSim.Region.Capabilities |
33 | { | 31 | { |
diff --git a/OpenSim/Region/Capabilities/LLSDUploadReply.cs b/OpenSim/Region/Capabilities/LLSDUploadReply.cs index 83cf166..023a056 100644 --- a/OpenSim/Region/Capabilities/LLSDUploadReply.cs +++ b/OpenSim/Region/Capabilities/LLSDUploadReply.cs | |||
@@ -25,11 +25,8 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | |||
32 | using libsecondlife; | 28 | using libsecondlife; |
29 | |||
33 | namespace OpenSim.Region.Capabilities | 30 | namespace OpenSim.Region.Capabilities |
34 | { | 31 | { |
35 | [LLSDType("MAP")] | 32 | [LLSDType("MAP")] |