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;
 using System.Collections;

 using System.Collections.Generic;

 using System.Text;

-using System.IO;

-using System.Xml;

+using libsecondlife;

 using OpenSim.Framework.Servers;

-using OpenSim.Framework;

-using OpenSim.Framework.Utilities;

 using OpenSim.Framework.Types;

+using OpenSim.Framework.Utilities;

 using OpenSim.Region.Caches;

-using libsecondlife;

 

 namespace OpenSim.Region.Capabilities

 {

@@ -126,7 +123,7 @@ namespace OpenSim.Region.Capabilities
         /// <returns></returns>

         public string MapLayer(string request, string path, string param)

         {

-            Encoding _enc = System.Text.Encoding.UTF8;

+            Encoding _enc = Encoding.UTF8;

             Hashtable hash =(Hashtable) LLSD.LLSDDeserialize(_enc.GetBytes(request));

             LLSDMapRequest mapReq = new LLSDMapRequest();

             LLSDHelpers.DeserialiseLLSDMap(hash, mapReq );

@@ -252,7 +249,7 @@ namespace OpenSim.Region.Capabilities
 

             public string uploaderCaps(string request, string path, string param)

             {

-                Encoding _enc = System.Text.Encoding.UTF8;

+                Encoding _enc = Encoding.UTF8;

                 byte[] data = _enc.GetBytes(request);

                 //Console.WriteLine("recieved upload " + Util.FieldToString(data));

                 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 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 * 

 */

-using System;

 using System.Collections;

-using System.Collections.Generic;

-using System.Text;

 

 namespace OpenSim.Region.Capabilities

 {

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 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 * 

 */

-using System;

-using System.Collections.Generic;

-using System.Text;

-

 namespace OpenSim.Region.Capabilities

 {

     [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 @@
-using System;

-using System.Collections.Generic;

-using System.Text;

-

 namespace OpenSim.Region.Capabilities

 {

     [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 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 * 

 */

-using System;

-using System.Collections.Generic;

-using System.Text;

-

 namespace OpenSim.Region.Capabilities

 {

     [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 @@
 */

 using System;

 using System.Collections;

-using System.Collections.Generic;

-using System.Text;

 using System.IO;

+using System.Reflection;

 using System.Xml;

 using libsecondlife;

 

@@ -43,7 +42,7 @@ namespace OpenSim.Region.Capabilities
             XmlTextWriter writer = new XmlTextWriter(sw);

             writer.Formatting = Formatting.None;

             writer.WriteStartElement(String.Empty, "llsd", String.Empty);

-            LLSDHelpers.SerializeLLSDType(writer, obj);

+            SerializeLLSDType(writer, obj);

             writer.WriteEndElement();

             writer.Close();

             return sw.ToString();

@@ -59,7 +58,7 @@ namespace OpenSim.Region.Capabilities
                 {

                     case "MAP":

                         writer.WriteStartElement(String.Empty, "map", String.Empty);

-                        System.Reflection.FieldInfo[] fields = myType.GetFields();

+                        FieldInfo[] fields = myType.GetFields();

                         for (int i = 0; i < fields.Length; i++)

                         {

                             object fieldValue = fields[i].GetValue(obj);

@@ -115,7 +114,7 @@ namespace OpenSim.Region.Capabilities
                         IDictionaryEnumerator enumerator = llsd.GetEnumerator();

                         while (enumerator.MoveNext())

                         {

-                            System.Reflection.FieldInfo field = myType.GetField((string)enumerator.Key);

+                            FieldInfo field = myType.GetField((string)enumerator.Key);

                             if (field != null)

                             {

                                 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 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 * 

 */

-using System;

-using System.Collections.Generic;

-using System.Text;

-

 using libsecondlife;

 

 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 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 * 

 */

-using System;

-using System.Collections.Generic;

-using System.Text;

-

 namespace OpenSim.Region.Capabilities

 {

     [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 @@
-using System;

-using System.Collections.Generic;

-using System.Text;

-

 namespace OpenSim.Region.Capabilities

 {

     [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 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 * 

 */

-using System;

-using System.Collections.Generic;

-using System.Text;

-

 namespace OpenSim.Region.Capabilities

 {

     [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 @@
 * 

 */

 using System;

-using System.Collections.Generic;

-using System.Text;

 

 namespace OpenSim.Region.Capabilities

 {

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 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 * 

 */

-using System;

-using System.Collections.Generic;

-using System.Text;

-

 using libsecondlife;

+

 namespace OpenSim.Region.Capabilities

 {

     [LLSDType("MAP")]