4 files changed, 15 insertions, 15 deletions

diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs b/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs
index ce564dd..d812e24 100644
--- a/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs
@@ -36,7 +36,7 @@ using System.Text.RegularExpressions;
 using System.Timers;
 using System.Xml;
 using System.Xml.Serialization;
-using libsecondlife;
+using OpenMetaverse;
 using Mono.Addins;
 using Nwc.XmlRpc;
 using Nini.Config;
@@ -109,11 +109,11 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
             // be resilient and don't get confused by a terminating '/'
             param = param.TrimEnd(new char[]{'/'});
             string[] comps = param.Split('/');
-            LLUUID regionID = (LLUUID)comps[0];
+            UUID regionID = (UUID)comps[0];
 
             m_log.DebugFormat("{0} GET region UUID {1}", MsgID, regionID.ToString());
 
-            if (LLUUID.Zero == regionID) throw new Exception("missing region ID");
+            if (UUID.Zero == regionID) throw new Exception("missing region ID");
 
             Scene scene = null;
             App.SceneManager.TryGetScene(regionID, out scene);
@@ -150,7 +150,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
                     return RegionStats(httpResponse, scene);
 
                 case "prims":
-                    return RegionPrims(httpResponse, scene, LLVector3.Zero, LLVector3.Zero);
+                    return RegionPrims(httpResponse, scene, Vector3.Zero, Vector3.Zero);
                 }
             }
 
@@ -162,11 +162,11 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
                     string[] subregion = comps[2].Split(',');
                     if (subregion.Length == 6)
                     {
-                        LLVector3 min, max;
+                        Vector3 min, max;
                         try
                         {
-                            min = new LLVector3((float)Double.Parse(subregion[0]), (float)Double.Parse(subregion[1]), (float)Double.Parse(subregion[2]));
-                            max = new LLVector3((float)Double.Parse(subregion[3]), (float)Double.Parse(subregion[4]), (float)Double.Parse(subregion[5]));
+                            min = new Vector3((float)Double.Parse(subregion[0]), (float)Double.Parse(subregion[1]), (float)Double.Parse(subregion[2]));
+                            max = new Vector3((float)Double.Parse(subregion[3]), (float)Double.Parse(subregion[4]), (float)Double.Parse(subregion[5]));
                         }
                         catch (Exception)
                         {
@@ -215,7 +215,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
             return XmlWriterResult;
         }
 
-        protected string RegionPrims(OSHttpResponse httpResponse, Scene scene, LLVector3 min, LLVector3 max)
+        protected string RegionPrims(OSHttpResponse httpResponse, Scene scene, Vector3 min, Vector3 max)
         {
             httpResponse.SendChunked = true;
             httpResponse.ContentType = "text/xml";
diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs b/OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs
index 6e3d1ff..73a1b9b 100644
--- a/OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs
@@ -36,7 +36,7 @@ using System.Text.RegularExpressions;
 using System.Timers;
 using System.Xml;
 using System.Xml.Serialization;
-using libsecondlife;
+using OpenMetaverse;
 using Mono.Addins;
 using Nwc.XmlRpc;
 using Nini.Config;
@@ -76,10 +76,10 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
                 // Parse region ID and other parameters
                 param = param.TrimEnd(new char[]{'/'});
                 string[] comps = param.Split('/');
-                LLUUID regionID = (LLUUID)comps[0];
+                UUID regionID = (UUID)comps[0];
 
                 m_log.DebugFormat("{0} POST region UUID {1}", MsgID, regionID.ToString());
-                if (LLUUID.Zero == regionID) throw new Exception("missing region ID");
+                if (UUID.Zero == regionID) throw new Exception("missing region ID");
 
                 Scene scene = null;
                 App.SceneManager.TryGetScene(regionID, out scene);
diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs b/OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs
index 74cf354..d517895 100644
--- a/OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs
@@ -25,7 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using libsecondlife;
+using OpenMetaverse;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -58,7 +58,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
             region_id = regInfo.RegionID.ToString();
             region_x = regInfo.RegionLocX;
             region_y = regInfo.RegionLocY;
-            if (regInfo.EstateSettings.EstateOwner != LLUUID.Zero)
+            if (regInfo.EstateSettings.EstateOwner != UUID.Zero)
                 region_owner_id = regInfo.EstateSettings.EstateOwner.ToString();
             else
                 region_owner_id = regInfo.MasterAvatarAssignedUUID.ToString();
@@ -101,4 +101,4 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs b/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs
index 1f68d2b..4c24f3f 100644
--- a/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs
@@ -36,7 +36,7 @@ using System.Text.RegularExpressions;
 using System.Timers;
 using System.Xml;
 using System.Xml.Serialization;
-using libsecondlife;
+using OpenMetaverse;
 using Nwc.XmlRpc;
 using Nini.Config;
 using OpenSim.Framework;