From 7d89e122930be39e84a6d174548fa2d12ac0484a Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Sat, 6 Sep 2008 07:52:41 +0000
Subject: * This is the fabled LibOMV update with all of the libOMV types from
 JHurliman * This is a HUGE OMG update and will definitely have unknown side
 effects.. so this is really only for the strong hearted at this point. 
 Regular people should let the dust settle. * This has been tested to work
 with most basic functions. However..   make sure you back up 'everything'
 before using this.  It's that big! * Essentially we're back at square 1 in
 the testing phase..  so lets identify things that broke.

---
 OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs')

diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
index c94b56a..8176d3f 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
@@ -28,7 +28,7 @@
 using System;
 using System.Reflection;
 using log4net;
-using libsecondlife;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Environment.Scenes;
 using OpenSim.Region.ScriptEngine.Common;
@@ -54,13 +54,13 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
         }
 
         // KEEP TRACK OF SCRIPTS <int id, whatever script>
-        //internal Dictionary<uint, Dictionary<LLUUID, LSL_BaseClass>> Scripts = new Dictionary<uint, Dictionary<LLUUID, LSL_BaseClass>>();
+        //internal Dictionary<uint, Dictionary<UUID, LSL_BaseClass>> Scripts = new Dictionary<uint, Dictionary<UUID, LSL_BaseClass>>();
         // LOAD SCRIPT
         // UNLOAD SCRIPT
         // PROVIDE SCRIPT WITH ITS INTERFACE TO OpenSim
 
 
-        public override void _StartScript(uint localID, LLUUID itemID, string Script, int startParam, bool postOnRez)
+        public override void _StartScript(uint localID, UUID itemID, string Script, int startParam, bool postOnRez)
         {
             m_log.DebugFormat(
                 "[{0}]: ScriptManager StartScript: localID: {1}, itemID: {2}",
@@ -84,7 +84,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
             }
 
             // Xantor 20080525: I need assetID here to see if we already compiled this one previously
-            LLUUID assetID = LLUUID.Zero;
+            UUID assetID = UUID.Zero;
             TaskInventoryItem taskInventoryItem = new TaskInventoryItem();
             if (m_host.TaskInventory.TryGetValue(itemID, out taskInventoryItem))
                 assetID = taskInventoryItem.AssetID;
@@ -153,7 +153,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
                     string text = "Error compiling script:\r\n" + e.Message.ToString();
                     if (text.Length > 1500)
                         text = text.Substring(0, 1499); // 0-1499 is 1500 characters
-                    World.SimChat(Helpers.StringToField(text), ChatTypeEnum.DebugChannel, 2147483647,
+                    World.SimChat(Utils.StringToBytes(text), ChatTypeEnum.DebugChannel, 2147483647,
                                   m_host.AbsolutePosition, m_host.Name, m_host.UUID, false);
                 }
                 catch (Exception e2) // LEGIT: User Scripting
@@ -165,7 +165,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
             }
         }
 
-        public override void _StopScript(uint localID, LLUUID itemID)
+        public override void _StopScript(uint localID, UUID itemID)
         {
             // Stop script
 #if DEBUG
-- 
cgit v1.1