2 files changed, 14 insertions, 16 deletions

diff --git a/OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs b/OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs
index dbe2516..152825f 100644
--- a/OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs
+++ b/OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs
@@ -25,8 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using Axiom.Math;
-using libsecondlife;
+using OpenMetaverse;
 
 namespace OpenSim.Region.Environment.Scenes.Scripting
 {
@@ -35,10 +34,10 @@ namespace OpenSim.Region.Environment.Scenes.Scripting
         string Name { get; set; }
         string Description { get; set; }
 
-        LLUUID UUID { get; }
-        LLUUID ObjectOwner { get; }
-        LLUUID ObjectCreator { get; }
-        LLVector3 AbsolutePosition { get; }
+        UUID UUID { get; }
+        UUID ObjectOwner { get; }
+        UUID ObjectCreator { get; }
+        Vector3 AbsolutePosition { get; }
 
         string SitName { get; set; }
         string TouchName { get; set; }
diff --git a/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs b/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs
index 4b1b56a..37f5d43 100644
--- a/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs
+++ b/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs
@@ -26,14 +26,13 @@
  */
 
 using System;
-using Axiom.Math;
-using libsecondlife;
+using OpenMetaverse;
 
 namespace OpenSim.Region.Environment.Scenes.Scripting
 {
     public class NullScriptHost : IScriptHost
     {
-        private LLVector3 m_pos = new LLVector3(128, 128, 30);
+        private Vector3 m_pos = new Vector3(128, 128, 30);
 
         public string Name
         {
@@ -59,22 +58,22 @@ namespace OpenSim.Region.Environment.Scenes.Scripting
             set { }
         }
 
-        public LLUUID UUID
+        public UUID UUID
         {
-            get { return LLUUID.Zero; }
+            get { return UUID.Zero; }
         }
 
-        public LLUUID ObjectOwner
+        public UUID ObjectOwner
         {
-            get { return LLUUID.Zero; }
+            get { return UUID.Zero; }
         }
 
-        public LLUUID ObjectCreator
+        public UUID ObjectCreator
         {
-            get { return LLUUID.Zero; }
+            get { return UUID.Zero; }
         }
 
-        public LLVector3 AbsolutePosition
+        public Vector3 AbsolutePosition
         {
             get { return m_pos; }
         }