3 files changed, 17 insertions, 17 deletions

diff --git a/OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs b/OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs
index 2df41d0..e94de68 100644
--- a/OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs
+++ b/OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs
@@ -26,7 +26,7 @@
  */
 
 using System;
-using libsecondlife;
+using OpenMetaverse;
 using OpenSim.Region.Environment.Scenes;
 
 
@@ -38,6 +38,6 @@ namespace OpenSim.Region.ScriptEngine.Interfaces
         // Each API has an identifier, which is used to load the
         // proper runtime assembly at load time.
         //
-        void Initialize(IScriptEngine engine, SceneObjectPart part, uint localID, LLUUID item);
+        void Initialize(IScriptEngine engine, SceneObjectPart part, uint localID, UUID item);
     }
 }
diff --git a/OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs b/OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs
index 6b3804c..4b46c21 100644
--- a/OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs
+++ b/OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs
@@ -29,7 +29,7 @@ using log4net;
 using System;
 using OpenSim.Region.ScriptEngine.Shared;
 using OpenSim.Region.Environment.Scenes;
-using libsecondlife;
+using OpenMetaverse;
 using Nini.Config;
 using OpenSim.Region.ScriptEngine.Interfaces;
 using Amib.Threading;
@@ -49,16 +49,16 @@ namespace OpenSim.Region.ScriptEngine.Interfaces
         ILog Log { get; }
         string ScriptEngineName { get; }
 
-        bool PostScriptEvent(LLUUID itemID, EventParams parms);
+        bool PostScriptEvent(UUID itemID, EventParams parms);
         bool PostObjectEvent(uint localID, EventParams parms);
-        void ApiResetScript(LLUUID itemID);
-        void ResetScript(LLUUID itemID);
-        void SetScriptState(LLUUID itemID, bool state);
-        bool GetScriptState(LLUUID itemID);
-        void SetState(LLUUID itemID, string newState);
-        int GetStartParameter(LLUUID itemID);
+        void ApiResetScript(UUID itemID);
+        void ResetScript(UUID itemID);
+        void SetScriptState(UUID itemID, bool state);
+        bool GetScriptState(UUID itemID);
+        void SetState(UUID itemID, string newState);
+        int GetStartParameter(UUID itemID);
         IScriptWorkItem QueueEventHandler(object parms);
 
-        DetectParams GetDetectParams(LLUUID item, int number);
+        DetectParams GetDetectParams(UUID item, int number);
     }
 }
diff --git a/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs b/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs
index 3aeb602..f79c1a3 100644
--- a/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs
@@ -28,7 +28,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using libsecondlife;
+using OpenMetaverse;
 using log4net;
 using OpenSim.Framework;
 using OpenSim.Region.ScriptEngine.Shared;
@@ -55,13 +55,13 @@ namespace OpenSim.Region.ScriptEngine.Interfaces
         bool Running { get; set; }
         string State { get; set; }
         IScriptEngine Engine { get; }
-        LLUUID AppDomain { get; set; }
+        UUID AppDomain { get; set; }
         string PrimName { get; }
         string ScriptName { get; }
-        LLUUID ItemID { get; }
-        LLUUID ObjectID { get; }
+        UUID ItemID { get; }
+        UUID ObjectID { get; }
         uint LocalID { get; }
-        LLUUID AssetID { get; }
+        UUID AssetID { get; }
         Queue EventQueue { get; }
 
         void ClearQueue();
@@ -82,7 +82,7 @@ namespace OpenSim.Region.ScriptEngine.Interfaces
         Dictionary<string, object> GetVars();
         void SetVars(Dictionary<string, object> vars);
         DetectParams GetDetectParams(int idx);
-        LLUUID GetDetectID(int idx);
+        UUID GetDetectID(int idx);
         void SaveState(string assembly);
     }
 }