aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/DotNetEngine
diff options
context:
space:
mode:
authorTeravus Ovares2008-09-06 07:52:41 +0000
committerTeravus Ovares2008-09-06 07:52:41 +0000
commit7d89e122930be39e84a6d174548fa2d12ac0484a (patch)
treee5aa5752f988a9aba2a969f49e5e208985eda80c /OpenSim/Region/ScriptEngine/DotNetEngine
parent* minor: speculatively try a change to bamboo.build to see if this generates ... (diff)
downloadopensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.zip
opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz
opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2
opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.xz
* 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.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/DotNetEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs12
2 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs
index 371ba45..cf1d489 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs
@@ -120,7 +120,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
120 //System.Console.WriteLine("SCRIPT:" + checkscript); 120 //System.Console.WriteLine("SCRIPT:" + checkscript);
121 121
122 // checks for alpha.alpha way of referring to objects in C# 122 // checks for alpha.alpha way of referring to objects in C#
123 // ignores alpha.x alpha.y, alpha.z for refering to vector components 123 // ignores alpha.X alpha.Y, alpha.Z for refering to vector components
124 Match SecurityM; 124 Match SecurityM;
125 125
126 126
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 @@
28using System; 28using System;
29using System.Reflection; 29using System.Reflection;
30using log4net; 30using log4net;
31using libsecondlife; 31using OpenMetaverse;
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Region.Environment.Scenes; 33using OpenSim.Region.Environment.Scenes;
34using OpenSim.Region.ScriptEngine.Common; 34using OpenSim.Region.ScriptEngine.Common;
@@ -54,13 +54,13 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
54 } 54 }
55 55
56 // KEEP TRACK OF SCRIPTS <int id, whatever script> 56 // KEEP TRACK OF SCRIPTS <int id, whatever script>
57 //internal Dictionary<uint, Dictionary<LLUUID, LSL_BaseClass>> Scripts = new Dictionary<uint, Dictionary<LLUUID, LSL_BaseClass>>(); 57 //internal Dictionary<uint, Dictionary<UUID, LSL_BaseClass>> Scripts = new Dictionary<uint, Dictionary<UUID, LSL_BaseClass>>();
58 // LOAD SCRIPT 58 // LOAD SCRIPT
59 // UNLOAD SCRIPT 59 // UNLOAD SCRIPT
60 // PROVIDE SCRIPT WITH ITS INTERFACE TO OpenSim 60 // PROVIDE SCRIPT WITH ITS INTERFACE TO OpenSim
61 61
62 62
63 public override void _StartScript(uint localID, LLUUID itemID, string Script, int startParam, bool postOnRez) 63 public override void _StartScript(uint localID, UUID itemID, string Script, int startParam, bool postOnRez)
64 { 64 {
65 m_log.DebugFormat( 65 m_log.DebugFormat(
66 "[{0}]: ScriptManager StartScript: localID: {1}, itemID: {2}", 66 "[{0}]: ScriptManager StartScript: localID: {1}, itemID: {2}",
@@ -84,7 +84,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
84 } 84 }
85 85
86 // Xantor 20080525: I need assetID here to see if we already compiled this one previously 86 // Xantor 20080525: I need assetID here to see if we already compiled this one previously
87 LLUUID assetID = LLUUID.Zero; 87 UUID assetID = UUID.Zero;
88 TaskInventoryItem taskInventoryItem = new TaskInventoryItem(); 88 TaskInventoryItem taskInventoryItem = new TaskInventoryItem();
89 if (m_host.TaskInventory.TryGetValue(itemID, out taskInventoryItem)) 89 if (m_host.TaskInventory.TryGetValue(itemID, out taskInventoryItem))
90 assetID = taskInventoryItem.AssetID; 90 assetID = taskInventoryItem.AssetID;
@@ -153,7 +153,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
153 string text = "Error compiling script:\r\n" + e.Message.ToString(); 153 string text = "Error compiling script:\r\n" + e.Message.ToString();
154 if (text.Length > 1500) 154 if (text.Length > 1500)
155 text = text.Substring(0, 1499); // 0-1499 is 1500 characters 155 text = text.Substring(0, 1499); // 0-1499 is 1500 characters
156 World.SimChat(Helpers.StringToField(text), ChatTypeEnum.DebugChannel, 2147483647, 156 World.SimChat(Utils.StringToBytes(text), ChatTypeEnum.DebugChannel, 2147483647,
157 m_host.AbsolutePosition, m_host.Name, m_host.UUID, false); 157 m_host.AbsolutePosition, m_host.Name, m_host.UUID, false);
158 } 158 }
159 catch (Exception e2) // LEGIT: User Scripting 159 catch (Exception e2) // LEGIT: User Scripting
@@ -165,7 +165,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
165 } 165 }
166 } 166 }
167 167
168 public override void _StopScript(uint localID, LLUUID itemID) 168 public override void _StopScript(uint localID, UUID itemID)
169 { 169 {
170 // Stop script 170 // Stop script
171#if DEBUG 171#if DEBUG