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. --- .../Region/ScriptEngine/Common/BuilIn_Commands.cs | 4 +- .../ScriptEngine/Common/LSL_BuiltIn_Commands.cs | 586 +++++++++++---------- OpenSim/Region/ScriptEngine/Common/LSL_Types.cs | 2 +- .../ScriptEngine/Common/OSSL_BuilIn_Commands.cs | 29 +- .../Common/ScriptEngineBase/AsyncCommandManager.cs | 4 +- .../AsyncCommandPlugins/Dataserver.cs | 14 +- .../AsyncCommandPlugins/SensorRepeat.cs | 42 +- .../ScriptEngineBase/AsyncCommandPlugins/Timer.cs | 8 +- .../Common/ScriptEngineBase/EventManager.cs | 64 +-- .../Common/ScriptEngineBase/EventQueueManager.cs | 10 +- .../ScriptEngineBase/EventQueueThreadClass.cs | 4 +- .../Common/ScriptEngineBase/ScriptManager.cs | 48 +- .../ScriptEngine/Common/ScriptServerInterfaces.cs | 58 +- OpenSim/Region/ScriptEngine/Common/TRPC_Remote.cs | 4 +- .../DotNetEngine/Compiler/LSL/LSL2CSConverter.cs | 2 +- .../ScriptEngine/DotNetEngine/ScriptManager.cs | 12 +- .../Region/ScriptEngine/Interfaces/IScriptApi.cs | 4 +- .../ScriptEngine/Interfaces/IScriptEngine.cs | 18 +- .../ScriptEngine/Interfaces/IScriptInstance.cs | 12 +- .../ScriptEngine/RemoteServer/EventManager.cs | 70 +-- .../Api/Implementation/AsyncCommandManager.cs | 8 +- .../Shared/Api/Implementation/LSL_Api.cs | 559 ++++++++++---------- .../Shared/Api/Implementation/OSSL_Api.cs | 31 +- .../Api/Implementation/Plugins/Dataserver.cs | 14 +- .../Shared/Api/Implementation/Plugins/Listener.cs | 6 +- .../Api/Implementation/Plugins/SensorRepeat.cs | 50 +- .../Shared/Api/Implementation/Plugins/Timer.cs | 12 +- .../Shared/CodeTools/LSL2CSConverter.cs | 2 +- OpenSim/Region/ScriptEngine/Shared/Helpers.cs | 28 +- .../ScriptEngine/Shared/Instance/ScriptInstance.cs | 30 +- .../Shared/Instance/ScriptSerializer.cs | 20 +- OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs | 2 +- .../Region/ScriptEngine/XEngine/EventManager.cs | 35 +- OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 86 +-- 34 files changed, 949 insertions(+), 929 deletions(-) (limited to 'OpenSim/Region/ScriptEngine') diff --git a/OpenSim/Region/ScriptEngine/Common/BuilIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/BuilIn_Commands.cs index 1a50f0b..9c45ab5 100644 --- a/OpenSim/Region/ScriptEngine/Common/BuilIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/Common/BuilIn_Commands.cs @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using libsecondlife; +using OpenMetaverse; using OpenSim.Region.Environment.Scenes; namespace OpenSim.Region.ScriptEngine.Common @@ -36,7 +36,7 @@ namespace OpenSim.Region.ScriptEngine.Common public class BuilIn_Commands : OSSL_BuilIn_Commands { public BuilIn_Commands(ScriptEngineBase.ScriptEngine scriptEngine, SceneObjectPart host, uint localID, - LLUUID itemID) : base(scriptEngine, host, localID, itemID) + UUID itemID) : base(scriptEngine, host, localID, itemID) { } } diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs index bcdff8f..0c5d60b 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs @@ -32,9 +32,8 @@ using System.Runtime.Remoting.Lifetime; using System.Text; using System.Threading; using Nini.Config; -using Axiom.Math; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; using OpenSim.Framework; using OpenSim.Framework.Communications.Cache; using OpenSim.Region.Environment; @@ -60,10 +59,10 @@ namespace OpenSim.Region.ScriptEngine.Common internal ScriptEngineBase.ScriptEngine m_ScriptEngine; internal SceneObjectPart m_host; internal uint m_localID; - internal LLUUID m_itemID; + internal UUID m_itemID; internal bool throwErrorOnNotImplemented = true; - public LSL_BuiltIn_Commands(ScriptEngineBase.ScriptEngine ScriptEngine, SceneObjectPart host, uint localID, LLUUID itemID) + public LSL_BuiltIn_Commands(ScriptEngineBase.ScriptEngine ScriptEngine, SceneObjectPart host, uint localID, UUID itemID) { m_ScriptEngine = ScriptEngine; m_host = host; @@ -151,11 +150,11 @@ namespace OpenSim.Region.ScriptEngine.Common return World.GetCommander(name); } - private LLUUID InventorySelf() + private UUID InventorySelf() { - LLUUID invItemID = new LLUUID(); + UUID invItemID = new UUID(); - foreach (KeyValuePair inv in m_host.TaskInventory) + foreach (KeyValuePair inv in m_host.TaskInventory) { if (inv.Value.Type == 10 && inv.Value.ItemID == m_itemID) { @@ -167,54 +166,54 @@ namespace OpenSim.Region.ScriptEngine.Common return invItemID; } - private LLUUID InventoryKey(string name, int type) + private UUID InventoryKey(string name, int type) { m_host.AddScriptLPS(1); - foreach (KeyValuePair inv in m_host.TaskInventory) + foreach (KeyValuePair inv in m_host.TaskInventory) { if (inv.Value.Name == name) { if (inv.Value.Type != type) - return LLUUID.Zero; + return UUID.Zero; return inv.Value.AssetID.ToString(); } } - return LLUUID.Zero; + return UUID.Zero; } - private LLUUID InventoryKey(string name) + private UUID InventoryKey(string name) { m_host.AddScriptLPS(1); - foreach (KeyValuePair inv in m_host.TaskInventory) + foreach (KeyValuePair inv in m_host.TaskInventory) { if (inv.Value.Name == name) { return inv.Value.AssetID.ToString(); } } - return LLUUID.Zero; + return UUID.Zero; } /// - /// accepts a valid LLUUID, -or- a name of an inventory item. - /// Returns a valid LLUUID or LLUUID.Zero if key invalid and item not found + /// accepts a valid UUID, -or- a name of an inventory item. + /// Returns a valid UUID or UUID.Zero if key invalid and item not found /// in prim inventory. /// /// /// - private LLUUID KeyOrName(string k) + private UUID KeyOrName(string k) { - LLUUID key = LLUUID.Zero; + UUID key = UUID.Zero; // if we can parse the string as a key, use it. - if (LLUUID.TryParse(k, out key)) + if (UUID.TryParse(k, out key)) { return key; } // else try to locate the name in inventory of object. found returns key, - // not found returns LLUUID.Zero which will translate to the default particle texture + // not found returns UUID.Zero which will translate to the default particle texture else { return InventoryKey(k); @@ -573,7 +572,7 @@ namespace OpenSim.Region.ScriptEngine.Common if (text.Length > 1023) text = text.Substring(0, 1023); - World.SimChat(Helpers.StringToField(text), + World.SimChat(Utils.StringToBytes(text), ChatTypeEnum.Whisper, channelID, m_host.AbsolutePosition, m_host.Name, m_host.UUID, false); IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface(); @@ -587,7 +586,7 @@ namespace OpenSim.Region.ScriptEngine.Common if (text.Length > 1023) text = text.Substring(0, 1023); - World.SimChat(Helpers.StringToField(text), + World.SimChat(Utils.StringToBytes(text), ChatTypeEnum.Say, channelID, m_host.AbsolutePosition, m_host.Name, m_host.UUID, false); IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface(); @@ -601,7 +600,7 @@ namespace OpenSim.Region.ScriptEngine.Common if (text.Length > 1023) text = text.Substring(0, 1023); - World.SimChat(Helpers.StringToField(text), + World.SimChat(Utils.StringToBytes(text), ChatTypeEnum.Shout, channelID, m_host.AbsolutePosition, m_host.Name, m_host.UUID, true); IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface(); @@ -628,8 +627,8 @@ namespace OpenSim.Region.ScriptEngine.Common public LSL_Types.LSLInteger llListen(int channelID, string name, string ID, string msg) { m_host.AddScriptLPS(1); - LLUUID keyID; - LLUUID.TryParse(ID, out keyID); + UUID keyID; + UUID.TryParse(ID, out keyID); IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface(); return wComm.Listen(m_localID, m_itemID, m_host.UUID, channelID, name, keyID, msg); } @@ -651,8 +650,8 @@ namespace OpenSim.Region.ScriptEngine.Common public void llSensor(string name, string id, int type, double range, double arc) { m_host.AddScriptLPS(1); - LLUUID keyID = LLUUID.Zero; - LLUUID.TryParse(id, out keyID); + UUID keyID = UUID.Zero; + UUID.TryParse(id, out keyID); m_ScriptEngine.m_ASYNCLSLCommandManager.m_SensorRepeat.SenseOnce(m_localID, m_itemID, name, keyID, type, range, arc, m_host); } @@ -660,8 +659,8 @@ namespace OpenSim.Region.ScriptEngine.Common public void llSensorRepeat(string name, string id, int type, double range, double arc, double rate) { m_host.AddScriptLPS(1); - LLUUID keyID = LLUUID.Zero; - LLUUID.TryParse(id, out keyID); + UUID keyID = UUID.Zero; + UUID.TryParse(id, out keyID); m_ScriptEngine.m_ASYNCLSLCommandManager.m_SensorRepeat.SetSenseRepeatEvent(m_localID, m_itemID, name, keyID, type, range, arc, rate, m_host); } @@ -672,7 +671,7 @@ namespace OpenSim.Region.ScriptEngine.Common m_ScriptEngine.m_ASYNCLSLCommandManager.m_SensorRepeat.UnSetSenseRepeaterEvents(m_localID, m_itemID); } - public string resolveName(LLUUID objecUUID) + public string resolveName(UUID objecUUID) { // try avatar username surname CachedUserInfo profile = World.CommsManager.UserProfileCacheService.GetUserDetails(objecUUID); @@ -708,7 +707,7 @@ namespace OpenSim.Region.ScriptEngine.Common { if ((number >= 0) && (number <= SenseList.Length)) { - LLUUID SensedUUID = (LLUUID)SenseList.Data[number]; + UUID SensedUUID = (UUID)SenseList.Data[number]; return resolveName(SensedUUID); } } @@ -741,14 +740,14 @@ namespace OpenSim.Region.ScriptEngine.Common return String.Empty; } - public LLUUID uuidDetectedKey(int number) + public UUID uuidDetectedKey(int number) { LSL_Types.list SenseList = m_ScriptEngine.m_ASYNCLSLCommandManager.m_SensorRepeat.GetSensorList(m_localID, m_itemID); if (SenseList != null) { if ((number >= 0) && (number < SenseList.Length)) { - LLUUID SensedUUID = (LLUUID)SenseList.Data[number]; + UUID SensedUUID = (UUID)SenseList.Data[number]; return SensedUUID; } } @@ -768,14 +767,14 @@ namespace OpenSim.Region.ScriptEngine.Common { if (script.llDetectParams._key[number]) { - return new LLUUID(script.llDetectParams._key[number]); + return new UUID(script.llDetectParams._key[number]); } } } } } } - return LLUUID.Zero; + return UUID.Zero; } public EntityBase entityDetectedKey(int number) @@ -785,7 +784,7 @@ namespace OpenSim.Region.ScriptEngine.Common { if ((number >= 0) && (number < SenseList.Length)) { - LLUUID SensedUUID = (LLUUID)SenseList.Data[number]; + UUID SensedUUID = (UUID)SenseList.Data[number]; EntityBase SensedObject = null; lock (World.Entities) { @@ -810,7 +809,7 @@ namespace OpenSim.Region.ScriptEngine.Common { if (script.llDetectParams._key[number]) { - LLUUID SensedUUID = new LLUUID(script.llDetectParams._key[number]); + UUID SensedUUID = new UUID(script.llDetectParams._key[number]); EntityBase SensedObject = null; lock (World.Entities) { @@ -830,8 +829,8 @@ namespace OpenSim.Region.ScriptEngine.Common public string llDetectedKey(int number) { m_host.AddScriptLPS(1); - LLUUID SensedUUID = uuidDetectedKey(number); - if (SensedUUID == LLUUID.Zero) + UUID SensedUUID = uuidDetectedKey(number); + if (SensedUUID == UUID.Zero) return String.Empty; return SensedUUID.ToString(); } @@ -843,7 +842,7 @@ namespace OpenSim.Region.ScriptEngine.Common EntityBase SensedObject = entityDetectedKey(number); if (SensedObject ==null) return String.Empty; - LLUUID SensedUUID = uuidDetectedKey(number); + UUID SensedUUID = uuidDetectedKey(number); if (World.GetScenePresence(SensedUUID) == null) { // sensed object is not an avatar @@ -870,7 +869,7 @@ namespace OpenSim.Region.ScriptEngine.Common return 0; int mask = 0; - LLUUID SensedUUID = uuidDetectedKey(number); + UUID SensedUUID = uuidDetectedKey(number); LSL_Types.Vector3 ZeroVector = new LSL_Types.Vector3(0, 0, 0); if (World.GetScenePresence(SensedUUID) != null) mask |= 0x01; // actor @@ -888,7 +887,10 @@ namespace OpenSim.Region.ScriptEngine.Common EntityBase SensedObject = entityDetectedKey(number); if (SensedObject == null) return new LSL_Types.Vector3(0, 0, 0); - return new LSL_Types.Vector3(SensedObject.AbsolutePosition.X,SensedObject.AbsolutePosition.Y,SensedObject.AbsolutePosition.Z); + return new LSL_Types.Vector3( + SensedObject.AbsolutePosition.X, + SensedObject.AbsolutePosition.Y, + SensedObject.AbsolutePosition.Z); } public LSL_Types.Vector3 llDetectedVel(int number) @@ -897,7 +899,10 @@ namespace OpenSim.Region.ScriptEngine.Common EntityBase SensedObject = entityDetectedKey(number); if (SensedObject == null) return new LSL_Types.Vector3(0, 0, 0); - return new LSL_Types.Vector3(SensedObject.Velocity.X, SensedObject.Velocity.Y, SensedObject.Velocity.Z); + return new LSL_Types.Vector3( + SensedObject.Velocity.X, + SensedObject.Velocity.Y, + SensedObject.Velocity.Z); } public LSL_Types.Vector3 llDetectedGrab(int number) @@ -910,7 +915,7 @@ namespace OpenSim.Region.ScriptEngine.Common return new LSL_Types.Vector3( SensedObject.AbsolutePosition.X, SensedObject.AbsolutePosition.Y, - SensedObject.AbsolutePosition.Y); + SensedObject.AbsolutePosition.Z); } public LSL_Types.Quaternion llDetectedRot(int number) @@ -919,7 +924,11 @@ namespace OpenSim.Region.ScriptEngine.Common EntityBase SensedObject = entityDetectedKey(number); if (SensedObject == null) return new LSL_Types.Quaternion(); - return new LSL_Types.Quaternion(SensedObject.Rotation.x, SensedObject.Rotation.y, SensedObject.Rotation.z, SensedObject.Rotation.w); + return new LSL_Types.Quaternion( + SensedObject.Rotation.X, + SensedObject.Rotation.Y, + SensedObject.Rotation.Z, + SensedObject.Rotation.W); } public LSL_Types.LSLInteger llDetectedGroup(int number) @@ -1005,7 +1014,7 @@ namespace OpenSim.Region.ScriptEngine.Common if ((status & BuiltIn_Commands_BaseClass.STATUS_CAST_SHADOWS) == BuiltIn_Commands_BaseClass.STATUS_CAST_SHADOWS) { - m_host.AddFlag(LLObject.ObjectFlags.CastShadows); + m_host.AddFlag(PrimFlags.CastShadows); } if ((status & BuiltIn_Commands_BaseClass.STATUS_ROTATE_X) == BuiltIn_Commands_BaseClass.STATUS_ROTATE_X) @@ -1055,25 +1064,25 @@ namespace OpenSim.Region.ScriptEngine.Common public LSL_Types.LSLInteger llGetStatus(int status) { m_host.AddScriptLPS(1); - // Console.WriteLine(m_host.UUID.ToString() + " status is " + m_host.GetEffectiveObjectFlags().ToString()); + // Console.WriteLine(m_host.ToString() + " status is " + m_host.GetEffectiveObjectFlags().ToString()); switch (status) { case BuiltIn_Commands_BaseClass.STATUS_PHYSICS: - if ((m_host.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.Physics) == (uint)LLObject.ObjectFlags.Physics) + if ((m_host.GetEffectiveObjectFlags() & (uint)PrimFlags.Physics) == (uint)PrimFlags.Physics) { return 1; } return 0; case BuiltIn_Commands_BaseClass.STATUS_PHANTOM: - if ((m_host.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.Phantom) == (uint)LLObject.ObjectFlags.Phantom) + if ((m_host.GetEffectiveObjectFlags() & (uint)PrimFlags.Phantom) == (uint)PrimFlags.Phantom) { return 1; } return 0; case BuiltIn_Commands_BaseClass.STATUS_CAST_SHADOWS: - if ((m_host.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.CastShadows) == (uint)LLObject.ObjectFlags.CastShadows) + if ((m_host.GetEffectiveObjectFlags() & (uint)PrimFlags.CastShadows) == (uint)PrimFlags.CastShadows) { return 1; } @@ -1140,7 +1149,7 @@ namespace OpenSim.Region.ScriptEngine.Common scale.y = World.m_maxNonphys; if (scale.z > World.m_maxNonphys) scale.z = World.m_maxNonphys; - LLVector3 tmp = part.Scale; + Vector3 tmp = part.Scale; tmp.X = (float)scale.x; tmp.Y = (float)scale.y; tmp.Z = (float)scale.z; @@ -1163,8 +1172,8 @@ namespace OpenSim.Region.ScriptEngine.Common private void SetColor(SceneObjectPart part, LSL_Types.Vector3 color, int face) { - LLObject.TextureEntry tex = part.Shape.Textures; - LLColor texcolor; + Primitive.TextureEntry tex = part.Shape.Textures; + Color4 texcolor; if (face > -1) { texcolor = tex.CreateFace((uint)face).RGBA; @@ -1200,7 +1209,7 @@ namespace OpenSim.Region.ScriptEngine.Common public void SetGlow(SceneObjectPart part, int face, float glow) { - LLObject.TextureEntry tex = part.Shape.Textures; + Primitive.TextureEntry tex = part.Shape.Textures; if (face > -1) { tex.CreateFace((uint) face); @@ -1247,7 +1256,7 @@ namespace OpenSim.Region.ScriptEngine.Common break; } - LLObject.TextureEntry tex = part.Shape.Textures; + Primitive.TextureEntry tex = part.Shape.Textures; if (face > -1) { tex.CreateFace((uint) face); @@ -1275,7 +1284,7 @@ namespace OpenSim.Region.ScriptEngine.Common public void SetFullBright(SceneObjectPart part, int face, bool bright) { - LLObject.TextureEntry tex = part.Shape.Textures; + Primitive.TextureEntry tex = part.Shape.Textures; if (face > -1) { tex.CreateFace((uint) face); @@ -1301,7 +1310,7 @@ namespace OpenSim.Region.ScriptEngine.Common public double llGetAlpha(int face) { m_host.AddScriptLPS(1); - LLObject.TextureEntry tex = m_host.Shape.Textures; + Primitive.TextureEntry tex = m_host.Shape.Textures; if (face == -1) // TMP: Until we can determine number of sides, ALL_SIDES (-1) will return default color { return (double)((tex.DefaultTexture.RGBA.A * 255) / 255); @@ -1322,8 +1331,8 @@ namespace OpenSim.Region.ScriptEngine.Common private void SetAlpha(SceneObjectPart part, double alpha, int face) { - LLObject.TextureEntry tex = part.Shape.Textures; - LLColor texcolor; + Primitive.TextureEntry tex = part.Shape.Textures; + Color4 texcolor; if (face > -1) { texcolor = tex.CreateFace((uint)face).RGBA; @@ -1450,8 +1459,8 @@ namespace OpenSim.Region.ScriptEngine.Common public LSL_Types.Vector3 llGetColor(int face) { m_host.AddScriptLPS(1); - LLObject.TextureEntry tex = m_host.Shape.Textures; - LLColor texcolor; + Primitive.TextureEntry tex = m_host.Shape.Textures; + Color4 texcolor; LSL_Types.Vector3 rgb; if (face == -1) // TMP: Until we can determine number of sides, ALL_SIDES (-1) will return default color { @@ -1484,21 +1493,21 @@ namespace OpenSim.Region.ScriptEngine.Common private void SetTexture(SceneObjectPart part, string texture, int face) { - LLUUID textureID=new LLUUID(); + UUID textureID=new UUID(); - if (!LLUUID.TryParse(texture, out textureID)) + if (!UUID.TryParse(texture, out textureID)) { textureID=InventoryKey(texture, (int)AssetType.Texture); } - if (textureID == LLUUID.Zero) + if (textureID == UUID.Zero) return; - LLObject.TextureEntry tex = part.Shape.Textures; + Primitive.TextureEntry tex = part.Shape.Textures; if (face > -1) { - LLObject.TextureEntryFace texface = tex.CreateFace((uint)face); + Primitive.TextureEntryFace texface = tex.CreateFace((uint)face); texface.TextureID = textureID; tex.FaceTextures[face] = texface; part.UpdateTexture(tex); @@ -1529,10 +1538,10 @@ namespace OpenSim.Region.ScriptEngine.Common private void ScaleTexture(SceneObjectPart part, double u, double v, int face) { - LLObject.TextureEntry tex = part.Shape.Textures; + Primitive.TextureEntry tex = part.Shape.Textures; if (face > -1) { - LLObject.TextureEntryFace texface = tex.CreateFace((uint)face); + Primitive.TextureEntryFace texface = tex.CreateFace((uint)face); texface.RepeatU = (float)u; texface.RepeatV = (float)v; tex.FaceTextures[face] = texface; @@ -1565,10 +1574,10 @@ namespace OpenSim.Region.ScriptEngine.Common private void OffsetTexture(SceneObjectPart part, double u, double v, int face) { - LLObject.TextureEntry tex = part.Shape.Textures; + Primitive.TextureEntry tex = part.Shape.Textures; if (face > -1) { - LLObject.TextureEntryFace texface = tex.CreateFace((uint)face); + Primitive.TextureEntryFace texface = tex.CreateFace((uint)face); texface.OffsetU = (float)u; texface.OffsetV = (float)v; tex.FaceTextures[face] = texface; @@ -1601,10 +1610,10 @@ namespace OpenSim.Region.ScriptEngine.Common private void RotateTexture(SceneObjectPart part, double rotation, int face) { - LLObject.TextureEntry tex = part.Shape.Textures; + Primitive.TextureEntry tex = part.Shape.Textures; if (face > -1) { - LLObject.TextureEntryFace texface = tex.CreateFace((uint)face); + Primitive.TextureEntryFace texface = tex.CreateFace((uint)face); texface.Rotation = (float)rotation; tex.FaceTextures[face] = texface; part.UpdateTexture(tex); @@ -1628,14 +1637,14 @@ namespace OpenSim.Region.ScriptEngine.Common public string llGetTexture(int face) { m_host.AddScriptLPS(1); - LLObject.TextureEntry tex = m_host.Shape.Textures; + Primitive.TextureEntry tex = m_host.Shape.Textures; if (face == -1) { face = 0; } if (face > -1) { - LLObject.TextureEntryFace texface; + Primitive.TextureEntryFace texface; texface = tex.GetFace((uint)face); return texface.TextureID.ToString(); } @@ -1665,11 +1674,11 @@ namespace OpenSim.Region.ScriptEngine.Common if (part.ParentID != 0) { - part.UpdateOffSet(new LLVector3((float)targetPos.x, (float)targetPos.y, (float)targetPos.z)); + part.UpdateOffSet(new Vector3((float)targetPos.x, (float)targetPos.y, (float)targetPos.z)); } else { - part.UpdateGroupPosition(new LLVector3((float)targetPos.x, (float)targetPos.y, (float)targetPos.z)); + part.UpdateGroupPosition(new Vector3((float)targetPos.x, (float)targetPos.y, (float)targetPos.z)); } } @@ -1709,7 +1718,7 @@ namespace OpenSim.Region.ScriptEngine.Common private void SetRot(SceneObjectPart part, LSL_Types.Quaternion rot) { - part.UpdateRotation(new LLQuaternion((float)rot.x, (float)rot.y, (float)rot.z, (float)rot.s)); + part.UpdateRotation(new Quaternion((float)rot.x, (float)rot.y, (float)rot.z, (float)rot.s)); // Update rotation does not move the object in the physics scene if it's a linkset. part.ParentGroup.AbsolutePosition = part.ParentGroup.AbsolutePosition; } @@ -1717,14 +1726,18 @@ namespace OpenSim.Region.ScriptEngine.Common public LSL_Types.Quaternion llGetRot() { m_host.AddScriptLPS(1); - LLQuaternion q = m_host.RotationOffset; + Quaternion q = m_host.RotationOffset; return new LSL_Types.Quaternion(q.X, q.Y, q.Z, q.W); } public LSL_Types.Quaternion llGetLocalRot() { m_host.AddScriptLPS(1); - return new LSL_Types.Quaternion(m_host.RotationOffset.X, m_host.RotationOffset.Y, m_host.RotationOffset.Z, m_host.RotationOffset.W); + return new LSL_Types.Quaternion( + m_host.RotationOffset.X, + m_host.RotationOffset.Y, + m_host.RotationOffset.Z, + m_host.RotationOffset.W); } public void llSetForce(LSL_Types.Vector3 force, int local) @@ -1769,7 +1782,7 @@ namespace OpenSim.Region.ScriptEngine.Common public LSL_Types.LSLInteger llTarget(LSL_Types.Vector3 position, double range) { m_host.AddScriptLPS(1); - return m_host.registerTargetWaypoint(new LLVector3((float)position.x, (float)position.y, (float)position.z), (float)range); + return m_host.registerTargetWaypoint(new Vector3((float)position.x, (float)position.y, (float)position.z), (float)range); } @@ -1795,7 +1808,7 @@ namespace OpenSim.Region.ScriptEngine.Common public void llMoveToTarget(LSL_Types.Vector3 target, double tau) { m_host.AddScriptLPS(1); - m_host.MoveToTarget(new LLVector3((float)target.x, (float)target.y, (float)target.z), (float)tau); + m_host.MoveToTarget(new Vector3((float)target.x, (float)target.y, (float)target.z), (float)tau); } public void llStopMoveToTarget() @@ -1816,7 +1829,7 @@ namespace OpenSim.Region.ScriptEngine.Common if (force.z > 20000) force.z = 20000; - m_host.ApplyImpulse(new LLVector3((float)force.x, (float)force.y, (float)force.z), local != 0); + m_host.ApplyImpulse(new Vector3((float)force.x, (float)force.y, (float)force.z), local != 0); } public void llApplyRotationalImpulse(LSL_Types.Vector3 force, int local) @@ -1925,7 +1938,7 @@ namespace OpenSim.Region.ScriptEngine.Common { m_host.AddScriptLPS(1); - if (m_host.Sound != LLUUID.Zero) + if (m_host.Sound != UUID.Zero) llStopSound(); m_host.Sound = KeyOrName(sound); @@ -1967,7 +1980,7 @@ namespace OpenSim.Region.ScriptEngine.Common { m_host.AddScriptLPS(1); - m_host.Sound = LLUUID.Zero; + m_host.Sound = UUID.Zero; m_host.SoundGain = 0; m_host.SoundFlags = 0; m_host.SoundRadius = 0; @@ -1975,7 +1988,7 @@ namespace OpenSim.Region.ScriptEngine.Common m_host.ScheduleFullUpdate(); m_host.SendFullUpdateToAllClients(); - // m_host.SendSound(LLUUID.Zero.ToString(), 1.0, false, 2); + // m_host.SendSound(UUID.Zero.ToString(), 1.0, false, 2); } public void llPreloadSound(string sound) @@ -2223,13 +2236,13 @@ namespace OpenSim.Region.ScriptEngine.Common public LSL_Types.LSLInteger llGiveMoney(string destination, int amount) { - LLUUID invItemID=InventorySelf(); - if (invItemID == LLUUID.Zero) + UUID invItemID=InventorySelf(); + if (invItemID == UUID.Zero) return 0; m_host.AddScriptLPS(1); - if (m_host.TaskInventory[invItemID].PermsGranter == LLUUID.Zero) + if (m_host.TaskInventory[invItemID].PermsGranter == UUID.Zero) return 0; if ((m_host.TaskInventory[invItemID].PermsMask & BuiltIn_Commands_BaseClass.PERMISSION_DEBIT) == 0) @@ -2238,9 +2251,9 @@ namespace OpenSim.Region.ScriptEngine.Common return 0; } - LLUUID toID=new LLUUID(); + UUID toID=new UUID(); - if (!LLUUID.TryParse(destination, out toID)) + if (!UUID.TryParse(destination, out toID)) { LSLError("Bad key in llGiveMoney"); return 0; @@ -2303,7 +2316,7 @@ namespace OpenSim.Region.ScriptEngine.Common // it's possible to have two items with the same task inventory name. // this is an easter egg of sorts. - foreach (KeyValuePair inv in m_host.TaskInventory) + foreach (KeyValuePair inv in m_host.TaskInventory) { if (inv.Value.Name == inventory) { @@ -2314,18 +2327,18 @@ namespace OpenSim.Region.ScriptEngine.Common continue; } - LLVector3 llpos = new LLVector3((float)pos.x, (float)pos.y, (float)pos.z); + Vector3 llpos = new Vector3((float)pos.x, (float)pos.y, (float)pos.z); // test if we're further away then 10m if (Util.GetDistanceTo(llpos, m_host.AbsolutePosition) > 10) return; // wiki says, if it's further away then 10m, silently fail. - LLVector3 llvel = new LLVector3((float)vel.x, (float)vel.y, (float)vel.z); + Vector3 llvel = new Vector3((float)vel.x, (float)vel.y, (float)vel.z); // need the magnitude later float velmag = (float)Util.GetMagnitude(llvel); - SceneObjectGroup new_group = World.RezObject(m_host, inv.Value, llpos, new LLQuaternion((float)rot.x, (float)rot.y, (float)rot.z, (float)rot.s), llvel, param); + SceneObjectGroup new_group = World.RezObject(m_host, inv.Value, llpos, new Quaternion((float)rot.x, (float)rot.y, (float)rot.z, (float)rot.s), llvel, param); // If either of these are null, then there was an unknown error. if (new_group == null) @@ -2336,7 +2349,7 @@ namespace OpenSim.Region.ScriptEngine.Common // objects rezzed with this method are die_at_edge by default. new_group.RootPart.SetDieAtEdge(true); - m_ScriptEngine.m_EventQueueManager.AddToScriptQueue(m_localID, m_itemID, "object_rez", EventQueueManager.llDetectNull, new Object[] { new LSL_Types.LSLString(new_group.RootPart.UUID.ToString()) }); + m_ScriptEngine.m_EventQueueManager.AddToScriptQueue(m_localID, m_itemID, "object_rez", EventQueueManager.llDetectNull, new Object[] { new LSL_Types.LSLString(new_group.RootPart.ToString()) }); float groupmass = new_group.GetMass(); //Recoil. @@ -2401,7 +2414,7 @@ namespace OpenSim.Region.ScriptEngine.Common return; } - if (m_host.TaskInventory[InventorySelf()].PermsGranter != LLUUID.Zero) + if (m_host.TaskInventory[InventorySelf()].PermsGranter != UUID.Zero) { ScenePresence presence = World.GetScenePresence(m_host.TaskInventory[InventorySelf()].PermsGranter); @@ -2428,7 +2441,7 @@ namespace OpenSim.Region.ScriptEngine.Common return; } - if (m_host.TaskInventory[InventorySelf()].PermsGranter != LLUUID.Zero) + if (m_host.TaskInventory[InventorySelf()].PermsGranter != UUID.Zero) { ScenePresence presence = World.GetScenePresence(m_host.TaskInventory[InventorySelf()].PermsGranter); @@ -2489,14 +2502,14 @@ namespace OpenSim.Region.ScriptEngine.Common // TODO: figure out values for client, fromSession, and imSessionID // client.SendInstantMessage(m_host.UUID, fromSession, message, user, imSessionID, m_host.Name, AgentManager.InstantMessageDialog.MessageFromAgent, (uint)Util.UnixTimeSinceEpoch()); - LLUUID friendTransactionID = LLUUID.Random(); + UUID friendTransactionID = UUID.Random(); //m_pendingFriendRequests.Add(friendTransactionID, fromAgentID); GridInstantMessage msg = new GridInstantMessage(); - msg.fromAgentID = new Guid(m_host.UUID.ToString()); // fromAgentID.UUID; + msg.fromAgentID = new Guid(m_host.ToString()); // fromAgentID.Guid; msg.fromAgentSession = new Guid(friendTransactionID.ToString());// fromAgentSession.UUID; - msg.toAgentID = new Guid(user); // toAgentID.UUID; + msg.toAgentID = new Guid(user); // toAgentID.Guid; msg.imSessionID = new Guid(friendTransactionID.ToString()); // This is the item we're mucking with here // Console.WriteLine("[Scripting IM]: From:" + msg.fromAgentID.ToString() + " To: " + msg.toAgentID.ToString() + " Session:" + msg.imSessionID.ToString() + " Message:" + message); // Console.WriteLine("[Scripting IM]: Filling Session: " + msg.imSessionID.ToString()); @@ -2514,8 +2527,8 @@ namespace OpenSim.Region.ScriptEngine.Common msg.fromGroup = false;// fromGroup; msg.offline = (byte)0; //offline; msg.ParentEstateID = 0; //ParentEstateID; - msg.Position = new sLLVector3();// new sLLVector3(m_host.AbsolutePosition); - msg.RegionID = World.RegionInfo.RegionID.UUID;//RegionID.UUID; + msg.Position = Vector3.Zero;// new Vector3(m_host.AbsolutePosition); + msg.RegionID = World.RegionInfo.RegionID.Guid;//RegionID.Guid; msg.binaryBucket = new byte[0];// binaryBucket; World.TriggerGridInstantMessage(msg, InstantMessageReceiver.IMModule); // ScriptSleep(2000); @@ -2543,7 +2556,7 @@ namespace OpenSim.Region.ScriptEngine.Common public string llGetKey() { m_host.AddScriptLPS(1); - return m_host.UUID.ToString(); + return m_host.ToString(); } public void llSetBuoyancy(double buoyancy) @@ -2607,11 +2620,11 @@ namespace OpenSim.Region.ScriptEngine.Common { m_host.AddScriptLPS(1); - LLUUID invItemID=InventorySelf(); - if (invItemID == LLUUID.Zero) + UUID invItemID=InventorySelf(); + if (invItemID == UUID.Zero) return; - if (m_host.TaskInventory[invItemID].PermsGranter == LLUUID.Zero) + if (m_host.TaskInventory[invItemID].PermsGranter == UUID.Zero) return; if ((m_host.TaskInventory[invItemID].PermsMask & BuiltIn_Commands_BaseClass.PERMISSION_TRIGGER_ANIMATION) != 0) @@ -2620,9 +2633,9 @@ namespace OpenSim.Region.ScriptEngine.Common if (presence != null) { - // Do NOT try to parse LLUUID, animations cannot be triggered by ID - LLUUID animID=InventoryKey(anim, (int)AssetType.Animation); - if (animID == LLUUID.Zero) + // Do NOT try to parse UUID, animations cannot be triggered by ID + UUID animID=InventoryKey(anim, (int)AssetType.Animation); + if (animID == UUID.Zero) presence.AddAnimation(anim); else presence.AddAnimation(animID); @@ -2634,30 +2647,30 @@ namespace OpenSim.Region.ScriptEngine.Common { m_host.AddScriptLPS(1); - LLUUID invItemID=InventorySelf(); - if (invItemID == LLUUID.Zero) + UUID invItemID=InventorySelf(); + if (invItemID == UUID.Zero) return; - if (m_host.TaskInventory[invItemID].PermsGranter == LLUUID.Zero) + if (m_host.TaskInventory[invItemID].PermsGranter == UUID.Zero) return; if ((m_host.TaskInventory[invItemID].PermsMask & BuiltIn_Commands_BaseClass.PERMISSION_TRIGGER_ANIMATION) != 0) { - LLUUID animID = new LLUUID(); + UUID animID = new UUID(); - if (!LLUUID.TryParse(anim, out animID)) + if (!UUID.TryParse(anim, out animID)) { animID=InventoryKey(anim); } - if (animID == LLUUID.Zero) + if (animID == UUID.Zero) return; ScenePresence presence = World.GetScenePresence(m_host.TaskInventory[invItemID].PermsGranter); if (presence != null) { - if (animID == LLUUID.Zero) + if (animID == UUID.Zero) presence.RemoveAnimation(anim); else presence.RemoveAnimation(animID); @@ -2680,8 +2693,8 @@ namespace OpenSim.Region.ScriptEngine.Common public void llTargetOmega(LSL_Types.Vector3 axis, double spinrate, double gain) { m_host.AddScriptLPS(1); - m_host.RotationalVelocity = new LLVector3((float)(axis.x * spinrate), (float)(axis.y * spinrate), (float)(axis.z * spinrate)); - m_host.AngularVelocity = new LLVector3((float)(axis.x * spinrate), (float)(axis.y * spinrate), (float)(axis.z * spinrate)); + m_host.RotationalVelocity = new Vector3((float)(axis.x * spinrate), (float)(axis.y * spinrate), (float)(axis.z * spinrate)); + m_host.AngularVelocity = new Vector3((float)(axis.x * spinrate), (float)(axis.y * spinrate), (float)(axis.z * spinrate)); m_host.ScheduleTerseUpdate(); m_host.SendTerseUpdateToAllClients(); } @@ -2700,19 +2713,19 @@ namespace OpenSim.Region.ScriptEngine.Common public void llRequestPermissions(string agent, int perm) { - LLUUID agentID=new LLUUID(); + UUID agentID=new UUID(); - if (!LLUUID.TryParse(agent, out agentID)) + if (!UUID.TryParse(agent, out agentID)) return; - LLUUID invItemID=InventorySelf(); + UUID invItemID=InventorySelf(); - if (invItemID == LLUUID.Zero) + if (invItemID == UUID.Zero) return; // Not in a prim? How?? - if (agentID == LLUUID.Zero || perm == 0) // Releasing permissions + if (agentID == UUID.Zero || perm == 0) // Releasing permissions { - m_host.TaskInventory[invItemID].PermsGranter=LLUUID.Zero; + m_host.TaskInventory[invItemID].PermsGranter=UUID.Zero; m_host.TaskInventory[invItemID].PermsMask=0; m_ScriptEngine.m_EventQueueManager.AddToScriptQueue( @@ -2786,14 +2799,14 @@ namespace OpenSim.Region.ScriptEngine.Common m_localID, m_itemID, "run_time_permissions", EventQueueManager.llDetectNull, new Object[] {new LSL_Types.LSLInteger(0)}); } - void handleScriptAnswer(IClientAPI client, LLUUID taskID, LLUUID itemID, int answer) + void handleScriptAnswer(IClientAPI client, UUID taskID, UUID itemID, int answer) { if (taskID != m_host.UUID) return; - LLUUID invItemID=InventorySelf(); + UUID invItemID=InventorySelf(); - if (invItemID == LLUUID.Zero) + if (invItemID == UUID.Zero) return; client.OnScriptAnswer-=handleScriptAnswer; @@ -2816,7 +2829,7 @@ namespace OpenSim.Region.ScriptEngine.Common } } - return LLUUID.Zero.ToString(); + return UUID.Zero.ToString(); } public LSL_Types.LSLInteger llGetPermissions() @@ -2854,8 +2867,8 @@ namespace OpenSim.Region.ScriptEngine.Common SceneObjectPart part = m_host.ParentGroup.GetLinkNumPart(linknumber); if (linknumber > -1) { - LLObject.TextureEntry tex = part.Shape.Textures; - LLColor texcolor; + Primitive.TextureEntry tex = part.Shape.Textures; + Color4 texcolor; if (face > -1) { texcolor = tex.CreateFace((uint)face).RGBA; @@ -2901,8 +2914,8 @@ namespace OpenSim.Region.ScriptEngine.Common { linknumber = w; part = m_host.ParentGroup.GetLinkNumPart(linknumber); - LLObject.TextureEntry tex = part.Shape.Textures; - LLColor texcolor; + Primitive.TextureEntry tex = part.Shape.Textures; + Color4 texcolor; if (face > -1) { texcolor = tex.CreateFace((uint)face).RGBA; @@ -2945,7 +2958,7 @@ namespace OpenSim.Region.ScriptEngine.Common public void llCreateLink(string target, int parent) { m_host.AddScriptLPS(1); - LLUUID invItemID = InventorySelf(); + UUID invItemID = InventorySelf(); if ((m_host.TaskInventory[invItemID].PermsMask & BuiltIn_Commands_BaseClass.PERMISSION_CHANGE_LINKS) == 0) { ShoutError("Script trying to link but PERMISSION_CHANGE_LINKS permission not set!"); return; @@ -2970,7 +2983,7 @@ namespace OpenSim.Region.ScriptEngine.Common childPrim.RootPart.UpdateFlag = uf; } parentPrim.TriggerScriptChangedEvent(Changed.LINK); - parentPrim.RootPart.AddFlag(LLObject.ObjectFlags.CreateSelected); + parentPrim.RootPart.AddFlag(PrimFlags.CreateSelected); parentPrim.GetProperties(client); ScriptSleep(1000); @@ -2994,11 +3007,11 @@ namespace OpenSim.Region.ScriptEngine.Common SceneObjectPart part = m_host.ParentGroup.GetLinkNumPart(linknum); if (part != null) { - return part.UUID.ToString(); + return part.ToString(); } else { - return LLUUID.Zero.ToString(); + return UUID.Zero.ToString(); } } @@ -3020,7 +3033,7 @@ namespace OpenSim.Region.ScriptEngine.Common { m_host.AddScriptLPS(1); int count = 0; - foreach (KeyValuePair inv in m_host.TaskInventory) + foreach (KeyValuePair inv in m_host.TaskInventory) { if (inv.Value.Type == type || type == -1) { @@ -3034,7 +3047,7 @@ namespace OpenSim.Region.ScriptEngine.Common { m_host.AddScriptLPS(1); ArrayList keys = new ArrayList(); - foreach (KeyValuePair inv in m_host.TaskInventory) + foreach (KeyValuePair inv in m_host.TaskInventory) { if (inv.Value.Type == type || type == -1) { @@ -3055,7 +3068,7 @@ namespace OpenSim.Region.ScriptEngine.Common public void llSetScriptState(string name, int run) { - LLUUID item; + UUID item; ScriptManager sm; IScript script = null; @@ -3064,7 +3077,7 @@ namespace OpenSim.Region.ScriptEngine.Common // These functions are supposed to be robust, // so get the state one step at a time. - if ((item = ScriptByName(name)) != LLUUID.Zero) + if ((item = ScriptByName(name)) != UUID.Zero) { if ((sm = m_ScriptEngine.m_ScriptManager) != null) { @@ -3098,17 +3111,17 @@ namespace OpenSim.Region.ScriptEngine.Common { m_host.AddScriptLPS(1); bool found = false; - LLUUID destId = LLUUID.Zero; - LLUUID objId = LLUUID.Zero; + UUID destId = UUID.Zero; + UUID objId = UUID.Zero; - if (!LLUUID.TryParse(destination, out destId)) + if (!UUID.TryParse(destination, out destId)) { llSay(0, "Could not parse key " + destination); return; } // move the first object found with this inventory name - foreach (KeyValuePair inv in m_host.TaskInventory) + foreach (KeyValuePair inv in m_host.TaskInventory) { if (inv.Value.Name == inventory) { @@ -3186,22 +3199,22 @@ namespace OpenSim.Region.ScriptEngine.Common { if (item.Type == 3 && item.Name == name) { - LLUUID tid = m_ScriptEngine.m_ASYNCLSLCommandManager.m_Dataserver.RegisterRequest( + UUID tid = m_ScriptEngine.m_ASYNCLSLCommandManager.m_Dataserver.RegisterRequest( m_localID, m_itemID, item.AssetID.ToString()); - LLVector3 region = new LLVector3( + Vector3 region = new Vector3( World.RegionInfo.RegionLocX * Constants.RegionSize, World.RegionInfo.RegionLocY * Constants.RegionSize, 0); World.AssetCache.GetAsset(item.AssetID, - delegate(LLUUID i, AssetBase a) + delegate(UUID i, AssetBase a) { AssetLandmark lm = new AssetLandmark(a); float rx = (uint)(lm.RegionHandle >> 32); float ry = (uint)lm.RegionHandle; - region = lm.Position + new LLVector3(rx, ry, 0) - region; + region = lm.Position + new Vector3(rx, ry, 0) - region; string reply = region.ToString(); m_ScriptEngine.m_ASYNCLSLCommandManager. @@ -3226,8 +3239,8 @@ namespace OpenSim.Region.ScriptEngine.Common public void llTeleportAgentHome(string agent) { m_host.AddScriptLPS(1); - LLUUID agentId = new LLUUID(); - if (LLUUID.TryParse(agent, out agentId)) + UUID agentId = new UUID(); + if (UUID.TryParse(agent, out agentId)) { ScenePresence presence = World.GetScenePresence(agentId); if (presence != null) @@ -3243,7 +3256,7 @@ namespace OpenSim.Region.ScriptEngine.Common public void llModifyLand(int action, int brush) { m_host.AddScriptLPS(1); - World.ExternalChecks.ExternalChecksCanTerraformLand(m_host.OwnerID, new LLVector3(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y, 0)); + World.ExternalChecks.ExternalChecksCanTerraformLand(m_host.OwnerID, new Vector3(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y, 0)); } public void llCollisionSound(string impact_sound, double impact_volume) @@ -3277,7 +3290,7 @@ namespace OpenSim.Region.ScriptEngine.Common m_host.AddScriptLPS(1); uint partLocalID; - LLUUID partItemID; + UUID partItemID; switch ((int)linknum) { @@ -3452,7 +3465,7 @@ namespace OpenSim.Region.ScriptEngine.Common SceneObjectPart targ = World.GetSceneObjectPart(target); if (targ == null) return; - targ.ApplyImpulse(new LLVector3((float)impulse.x, (float)impulse.y, (float)impulse.z), local != 0); + targ.ApplyImpulse(new Vector3((float)impulse.x, (float)impulse.y, (float)impulse.z), local != 0); } public void llPassCollisions(int pass) @@ -3731,7 +3744,7 @@ namespace OpenSim.Region.ScriptEngine.Common public string llGetInventoryKey(string name) { m_host.AddScriptLPS(1); - foreach (KeyValuePair inv in m_host.TaskInventory) + foreach (KeyValuePair inv in m_host.TaskInventory) { if (inv.Value.Name == name) { @@ -3741,11 +3754,11 @@ namespace OpenSim.Region.ScriptEngine.Common } else { - return LLUUID.Zero.ToString(); + return UUID.Zero.ToString(); } } } - return LLUUID.Zero.ToString(); + return UUID.Zero.ToString(); } public void llAllowInventoryDrop(int add) @@ -3763,10 +3776,10 @@ namespace OpenSim.Region.ScriptEngine.Common m_host.AddScriptLPS(1); LSL_Types.Vector3 SunDoubleVector3; - LLVector3 SunFloatVector3; + Vector3 SunFloatVector3; // sunPosition estate setting is set in OpenSim.Region.Environment.Modules.SunModule - // have to convert from LLVector3 (float) to LSL_Types.Vector3 (double) + // have to convert from Vector3 (float) to LSL_Types.Vector3 (double) SunFloatVector3 = World.RegionInfo.RegionSettings.SunVector; SunDoubleVector3.x = (double)SunFloatVector3.X; SunDoubleVector3.y = (double)SunFloatVector3.Y; @@ -3778,7 +3791,7 @@ namespace OpenSim.Region.ScriptEngine.Common public LSL_Types.Vector3 llGetTextureOffset(int face) { m_host.AddScriptLPS(1); - LLObject.TextureEntry tex = m_host.Shape.Textures; + Primitive.TextureEntry tex = m_host.Shape.Textures; LSL_Types.Vector3 offset; if (face == -1) { @@ -3793,7 +3806,7 @@ namespace OpenSim.Region.ScriptEngine.Common public LSL_Types.Vector3 llGetTextureScale(int side) { m_host.AddScriptLPS(1); - LLObject.TextureEntry tex = m_host.Shape.Textures; + Primitive.TextureEntry tex = m_host.Shape.Textures; LSL_Types.Vector3 scale; if (side == -1) { @@ -3808,7 +3821,7 @@ namespace OpenSim.Region.ScriptEngine.Common public double llGetTextureRot(int face) { m_host.AddScriptLPS(1); - LLObject.TextureEntry tex = m_host.Shape.Textures; + Primitive.TextureEntry tex = m_host.Shape.Textures; if (face == -1) { face = 0; @@ -3825,14 +3838,14 @@ namespace OpenSim.Region.ScriptEngine.Common public string llGetOwnerKey(string id) { m_host.AddScriptLPS(1); - LLUUID key = new LLUUID(); - if (LLUUID.TryParse(id, out key)) + UUID key = new UUID(); + if (UUID.TryParse(id, out key)) { return World.GetSceneObjectPart(World.Entities[key].LocalId).OwnerID.ToString(); } else { - return LLUUID.Zero.ToString(); + return UUID.Zero.ToString(); } } @@ -4041,8 +4054,8 @@ namespace OpenSim.Region.ScriptEngine.Common return 2; if (src.Data[index] is String) { - LLUUID tuuid; - if (LLUUID.TryParse(src.Data[index].ToString(), out tuuid)) + UUID tuuid; + if (UUID.TryParse(src.Data[index].ToString(), out tuuid)) { return 3; } @@ -4454,8 +4467,8 @@ namespace OpenSim.Region.ScriptEngine.Common public string llKey2Name(string id) { m_host.AddScriptLPS(1); - LLUUID key = new LLUUID(); - if (LLUUID.TryParse(id,out key)) + UUID key = new UUID(); + if (UUID.TryParse(id,out key)) { ScenePresence presence = World.GetScenePresence(key); @@ -4479,7 +4492,7 @@ namespace OpenSim.Region.ScriptEngine.Common { m_host.AddScriptLPS(1); Primitive.TextureAnimation pTexAnim = new Primitive.TextureAnimation(); - pTexAnim.Flags =(uint) mode; + pTexAnim.Flags =(Primitive.TextureAnimMode)mode; //ALL_SIDES if (face == -1) @@ -4568,8 +4581,8 @@ namespace OpenSim.Region.ScriptEngine.Common public LSL_Types.LSLInteger llOverMyLand(string id) { m_host.AddScriptLPS(1); - LLUUID key = new LLUUID(); - if (LLUUID.TryParse(id,out key)) + UUID key = new UUID(); + if (UUID.TryParse(id,out key)) { ScenePresence presence = World.GetScenePresence(key); if (presence != null) // object is an avatar @@ -4612,8 +4625,8 @@ namespace OpenSim.Region.ScriptEngine.Common { m_host.AddScriptLPS(1); - LLUUID key = new LLUUID(); - if (LLUUID.TryParse(id, out key)) + UUID key = new UUID(); + if (UUID.TryParse(id, out key)) { ScenePresence av = World.GetScenePresence(key); @@ -4751,8 +4764,8 @@ namespace OpenSim.Region.ScriptEngine.Common Primitive.ParticleSystem ps = new Primitive.ParticleSystem(); // TODO find out about the other defaults and add them here - ps.PartStartColor = new LLColor(1.0f, 1.0f, 1.0f, 1.0f); - ps.PartEndColor = new LLColor(1.0f, 1.0f, 1.0f, 1.0f); + ps.PartStartColor = new Color4(1.0f, 1.0f, 1.0f, 1.0f); + ps.PartEndColor = new Color4(1.0f, 1.0f, 1.0f, 1.0f); ps.PartStartScaleX = 1.0f; ps.PartStartScaleY = 1.0f; ps.PartEndScaleX = 1.0f; @@ -4800,7 +4813,7 @@ namespace OpenSim.Region.ScriptEngine.Common case (int)BuiltIn_Commands_BaseClass.PSYS_PART_END_COLOR: tempv = (LSL_Types.Vector3)rules.Data[i + 1]; - //prules.PartEndColor = new LLColor(tempv.x,tempv.y,tempv.z,1); + //prules.PartEndColor = new Color4(tempv.x,tempv.y,tempv.z,1); prules.PartEndColor.R = (float)tempv.x; prules.PartEndColor.G = (float)tempv.y; @@ -4879,8 +4892,8 @@ namespace OpenSim.Region.ScriptEngine.Common break; case (int)BuiltIn_Commands_BaseClass.PSYS_SRC_TARGET_KEY: - LLUUID key = LLUUID.Zero; - if (LLUUID.TryParse(rules.Data[i + 1].ToString(), out key)) + UUID key = UUID.Zero; + if (UUID.TryParse(rules.Data[i + 1].ToString(), out key)) { prules.Target = key; } @@ -4924,37 +4937,37 @@ namespace OpenSim.Region.ScriptEngine.Common NotImplemented("llGroundRepel"); } - private LLUUID GetTaskInventoryItem(string name) + private UUID GetTaskInventoryItem(string name) { - foreach (KeyValuePair inv in m_host.TaskInventory) + foreach (KeyValuePair inv in m_host.TaskInventory) { if (inv.Value.Name == name) return inv.Key; } - return LLUUID.Zero; + return UUID.Zero; } public void llGiveInventoryList(string destination, string category, LSL_Types.list inventory) { m_host.AddScriptLPS(1); - LLUUID destID; - if (!LLUUID.TryParse(destination, out destID)) + UUID destID; + if (!UUID.TryParse(destination, out destID)) return; - List itemList = new List(); + List itemList = new List(); foreach (Object item in inventory.Data) { - LLUUID itemID; - if (LLUUID.TryParse(item.ToString(), out itemID)) + UUID itemID; + if (UUID.TryParse(item.ToString(), out itemID)) { itemList.Add(itemID); } else { itemID = GetTaskInventoryItem(item.ToString()); - if (itemID != LLUUID.Zero) + if (itemID != UUID.Zero) itemList.Add(itemID); } } @@ -5015,7 +5028,7 @@ namespace OpenSim.Region.ScriptEngine.Common rot.z = 1; // ZERO_ROTATION = 0,0,0,1 m_host.SitTargetPosition = new Vector3((float)offset.x, (float)offset.y, (float)offset.z); - m_host.SitTargetOrientation = new Quaternion((float)rot.s, (float)rot.x, (float)rot.y, (float)rot.z); + m_host.SitTargetOrientation = new Quaternion((float)rot.x, (float)rot.y, (float)rot.z, (float)rot.s); } public string llAvatarOnSitTarget() @@ -5027,12 +5040,12 @@ namespace OpenSim.Region.ScriptEngine.Common public void llAddToLandPassList(string avatar, double hours) { m_host.AddScriptLPS(1); - LLUUID key; + UUID key; LandData land = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).landData; if (land.OwnerID == m_host.OwnerID) { ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry(); - if (LLUUID.TryParse(avatar, out key)) + if (UUID.TryParse(avatar, out key)) { entry.AgentID = key; entry.Flags = ParcelManager.AccessList.Access; @@ -5058,13 +5071,13 @@ namespace OpenSim.Region.ScriptEngine.Common public void llSetCameraEyeOffset(LSL_Types.Vector3 offset) { m_host.AddScriptLPS(1); - m_host.SetCameraEyeOffset(new LLVector3((float)offset.x, (float)offset.y, (float)offset.z)); + m_host.SetCameraEyeOffset(new Vector3((float)offset.x, (float)offset.y, (float)offset.z)); } public void llSetCameraAtOffset(LSL_Types.Vector3 offset) { m_host.AddScriptLPS(1); - m_host.SetCameraAtOffset(new LLVector3((float)offset.x, (float)offset.y, (float)offset.z)); + m_host.SetCameraAtOffset(new Vector3((float)offset.x, (float)offset.y, (float)offset.z)); } public string llDumpList2String(LSL_Types.list src, string seperator) @@ -5086,7 +5099,7 @@ namespace OpenSim.Region.ScriptEngine.Common public LSL_Types.LSLInteger llScriptDanger(LSL_Types.Vector3 pos) { m_host.AddScriptLPS(1); - bool result = World.scriptDanger(m_host.LocalId, new LLVector3((float)pos.x, (float)pos.y, (float)pos.z)); + bool result = World.scriptDanger(m_host.LocalId, new Vector3((float)pos.x, (float)pos.y, (float)pos.z)); if (result) { return 1; @@ -5101,8 +5114,8 @@ namespace OpenSim.Region.ScriptEngine.Common public void llDialog(string avatar, string message, LSL_Types.list buttons, int chat_channel) { m_host.AddScriptLPS(1); - LLUUID av = new LLUUID(); - if (!LLUUID.TryParse(avatar,out av)) + UUID av = new UUID(); + if (!UUID.TryParse(avatar,out av)) { LSLError("First parameter to llDialog needs to be a key"); return; @@ -5127,7 +5140,7 @@ namespace OpenSim.Region.ScriptEngine.Common } buts[i] = buttons.Data[i].ToString(); } - World.SendDialogToUser(av, m_host.Name, m_host.UUID, m_host.OwnerID, message, new LLUUID("00000000-0000-2222-3333-100000001000"), chat_channel, buts); + World.SendDialogToUser(av, m_host.Name, m_host.UUID, m_host.OwnerID, message, new UUID("00000000-0000-2222-3333-100000001000"), chat_channel, buts); // ScriptSleep(1000); } @@ -5144,7 +5157,7 @@ namespace OpenSim.Region.ScriptEngine.Common public void llResetOtherScript(string name) { - LLUUID item; + UUID item; ScriptManager sm; IScript script = null; @@ -5153,7 +5166,7 @@ namespace OpenSim.Region.ScriptEngine.Common // These functions are supposed to be robust, // so get the state one step at a time. - if ((item = ScriptByName(name)) != LLUUID.Zero) + if ((item = ScriptByName(name)) != UUID.Zero) if ((sm = m_ScriptEngine.m_ScriptManager) != null) sm.ResetScript(m_localID, item); @@ -5168,7 +5181,7 @@ namespace OpenSim.Region.ScriptEngine.Common public LSL_Types.LSLInteger llGetScriptState(string name) { - LLUUID item; + UUID item; ScriptManager sm; IScript script = null; @@ -5177,7 +5190,7 @@ namespace OpenSim.Region.ScriptEngine.Common // These functions are supposed to be robust, // so get the state one step at a time. - if ((item = ScriptByName(name)) != LLUUID.Zero) + if ((item = ScriptByName(name)) != UUID.Zero) { if ((sm = m_ScriptEngine.m_ScriptManager) != null) { @@ -5216,10 +5229,10 @@ namespace OpenSim.Region.ScriptEngine.Common { m_host.AddScriptLPS(1); bool found = false; - LLUUID destId = LLUUID.Zero; - LLUUID srcId = LLUUID.Zero; + UUID destId = UUID.Zero; + UUID srcId = UUID.Zero; - if (!LLUUID.TryParse(target, out destId)) + if (!UUID.TryParse(target, out destId)) { llSay(0, "Could not parse key " + target); return; @@ -5232,7 +5245,7 @@ namespace OpenSim.Region.ScriptEngine.Common } // copy the first script found with this inventory name - foreach (KeyValuePair inv in m_host.TaskInventory) + foreach (KeyValuePair inv in m_host.TaskInventory) { if (inv.Value.Name == name) { @@ -5264,8 +5277,8 @@ namespace OpenSim.Region.ScriptEngine.Common IXMLRPC xmlrpcMod = m_ScriptEngine.World.RequestModuleInterface(); if (xmlrpcMod.IsEnabled()) { - LLUUID channelID = xmlrpcMod.OpenXMLRPCChannel(m_localID, m_itemID, LLUUID.Zero); - object[] resobj = new object[] { new LSL_Types.LSLInteger(1), new LSL_Types.LSLString(channelID.ToString()), new LSL_Types.LSLString(LLUUID.Zero.ToString()), new LSL_Types.LSLString(String.Empty), new LSL_Types.LSLInteger(0), new LSL_Types.LSLString(String.Empty) }; + UUID channelID = xmlrpcMod.OpenXMLRPCChannel(m_localID, m_itemID, UUID.Zero); + object[] resobj = new object[] { new LSL_Types.LSLInteger(1), new LSL_Types.LSLString(channelID.ToString()), new LSL_Types.LSLString(UUID.Zero.ToString()), new LSL_Types.LSLString(String.Empty), new LSL_Types.LSLInteger(0), new LSL_Types.LSLString(String.Empty) }; m_ScriptEngine.m_EventQueueManager.AddToScriptQueue(m_localID, m_itemID, "remote_data", EventQueueManager.llDetectNull, resobj); } // ScriptSleep(1000); @@ -5583,9 +5596,9 @@ namespace OpenSim.Region.ScriptEngine.Common private void SetPrimitiveShapeParams(SceneObjectPart part, string map, int type) { ObjectShapePacket.ObjectDataBlock shapeBlock = new ObjectShapePacket.ObjectDataBlock(); - LLUUID sculptId; + UUID sculptId; - if (!LLUUID.TryParse(map, out sculptId)) + if (!UUID.TryParse(map, out sculptId)) { llSay(0, "Could not parse key " + map); return; @@ -6015,9 +6028,9 @@ namespace OpenSim.Region.ScriptEngine.Common ScenePresence av = World.GetScenePresence(id); if (av == null) return l; - LLUUID[] anims; + UUID[] anims; anims = av.GetAnimationArray(); - foreach (LLUUID foo in anims) + foreach (UUID foo in anims) l.Add(foo.ToString()); return l; } @@ -6025,8 +6038,8 @@ namespace OpenSim.Region.ScriptEngine.Common public void llSetParcelMusicURL(string url) { m_host.AddScriptLPS(1); - LLUUID landowner = World.GetLandOwner(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y); - if (landowner == LLUUID.Zero) + UUID landowner = World.GetLandOwner(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y); + if (landowner == UUID.Zero) { return; } @@ -6041,9 +6054,9 @@ namespace OpenSim.Region.ScriptEngine.Common public void osSetParcelMediaURL(string url) { m_host.AddScriptLPS(1); - LLUUID landowner = World.GetLandOwner(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y); + UUID landowner = World.GetLandOwner(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y); - if (landowner == LLUUID.Zero) + if (landowner == UUID.Zero) { return; } @@ -6059,13 +6072,20 @@ namespace OpenSim.Region.ScriptEngine.Common public LSL_Types.Vector3 llGetRootPosition() { m_host.AddScriptLPS(1); - return new LSL_Types.Vector3(m_host.ParentGroup.AbsolutePosition.X, m_host.ParentGroup.AbsolutePosition.Y, m_host.ParentGroup.AbsolutePosition.Z); + return new LSL_Types.Vector3( + m_host.ParentGroup.AbsolutePosition.X, + m_host.ParentGroup.AbsolutePosition.Y, + m_host.ParentGroup.AbsolutePosition.Z); } public LSL_Types.Quaternion llGetRootRotation() { m_host.AddScriptLPS(1); - return new LSL_Types.Quaternion(m_host.ParentGroup.GroupRotation.X, m_host.ParentGroup.GroupRotation.Y, m_host.ParentGroup.GroupRotation.Z, m_host.ParentGroup.GroupRotation.W); + return new LSL_Types.Quaternion( + m_host.ParentGroup.GroupRotation.X, + m_host.ParentGroup.GroupRotation.Y, + m_host.ParentGroup.GroupRotation.Z, + m_host.ParentGroup.GroupRotation.W); } public string llGetObjectDesc() @@ -6097,8 +6117,8 @@ namespace OpenSim.Region.ScriptEngine.Common SceneObjectPart part = m_host.ParentGroup.GetLinkNumPart(linknumber); if (linknumber > -1) { - LLObject.TextureEntry tex = part.Shape.Textures; - LLColor texcolor; + Primitive.TextureEntry tex = part.Shape.Textures; + Color4 texcolor; if (face > -1) { texcolor = tex.CreateFace((uint)face).RGBA; @@ -6136,8 +6156,8 @@ namespace OpenSim.Region.ScriptEngine.Common { linknumber = w; part = m_host.ParentGroup.GetLinkNumPart(linknumber); - LLObject.TextureEntry tex = part.Shape.Textures; - LLColor texcolor; + Primitive.TextureEntry tex = part.Shape.Textures; + Color4 texcolor; if (face > -1) { texcolor = tex.CreateFace((uint)face).RGBA; @@ -6184,7 +6204,8 @@ namespace OpenSim.Region.ScriptEngine.Common public LSL_Types.Vector3 llGetGeometricCenter() { - return new LSL_Types.Vector3(m_host.GetGeometricCenter().X, m_host.GetGeometricCenter().Y, m_host.GetGeometricCenter().Z); + return new LSL_Types.Vector3( + m_host.GetGeometricCenter().X, m_host.GetGeometricCenter().Y, m_host.GetGeometricCenter().Z); } public LSL_Types.list llGetPrimitiveParams(LSL_Types.list rules) @@ -6205,21 +6226,21 @@ namespace OpenSim.Region.ScriptEngine.Common break; case (int)BuiltIn_Commands_BaseClass.PRIM_PHYSICS: - if ((m_host.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.Physics) != 0) + if ((m_host.GetEffectiveObjectFlags() & (uint)PrimFlags.Physics) != 0) res.Add(new LSL_Types.LSLInteger(1)); else res.Add(new LSL_Types.LSLInteger(0)); break; case (int)BuiltIn_Commands_BaseClass.PRIM_TEMP_ON_REZ: - if ((m_host.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.TemporaryOnRez) != 0) + if ((m_host.GetEffectiveObjectFlags() & (uint)PrimFlags.TemporaryOnRez) != 0) res.Add(new LSL_Types.LSLInteger(1)); else res.Add(new LSL_Types.LSLInteger(0)); break; case (int)BuiltIn_Commands_BaseClass.PRIM_PHANTOM: - if ((m_host.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.Phantom) != 0) + if ((m_host.GetEffectiveObjectFlags() & (uint)PrimFlags.Phantom) != 0) res.Add(new LSL_Types.LSLInteger(1)); else res.Add(new LSL_Types.LSLInteger(0)); @@ -6324,8 +6345,8 @@ namespace OpenSim.Region.ScriptEngine.Common if (face == -1) face = 0; - LLObject.TextureEntry tex = m_host.Shape.Textures; - LLObject.TextureEntryFace texface = tex.GetFace((uint)face); + Primitive.TextureEntry tex = m_host.Shape.Textures; + Primitive.TextureEntryFace texface = tex.GetFace((uint)face); res.Add(new LSL_Types.LSLString(texface.TextureID.ToString())); res.Add(new LSL_Types.Vector3(texface.RepeatU, @@ -6344,7 +6365,7 @@ namespace OpenSim.Region.ScriptEngine.Common face=Convert.ToInt32("" + rules.Data[idx++]); tex = m_host.Shape.Textures; - LLColor texcolor; + Color4 texcolor; if (face == -1) // TMP: Until we can determine number of sides, ALL_SIDES (-1) will return default color texcolor = tex.DefaultTexture.RGBA; else @@ -6698,7 +6719,7 @@ namespace OpenSim.Region.ScriptEngine.Common public void llSetLocalRot(LSL_Types.Quaternion rot) { m_host.AddScriptLPS(1); - m_host.RotationOffset = new LLQuaternion((float)rot.x, (float)rot.y, (float)rot.z, (float)rot.s); + m_host.RotationOffset = new Quaternion((float)rot.x, (float)rot.y, (float)rot.z, (float)rot.s); // ScriptSleep(200); } @@ -6954,7 +6975,7 @@ namespace OpenSim.Region.ScriptEngine.Common public LSL_Types.LSLInteger llGetInventoryPermMask(string item, int mask) { m_host.AddScriptLPS(1); - foreach (KeyValuePair inv in m_host.TaskInventory) + foreach (KeyValuePair inv in m_host.TaskInventory) { if (inv.Value.Name == item) { @@ -6985,7 +7006,7 @@ namespace OpenSim.Region.ScriptEngine.Common public string llGetInventoryCreator(string item) { m_host.AddScriptLPS(1); - foreach (KeyValuePair inv in m_host.TaskInventory) + foreach (KeyValuePair inv in m_host.TaskInventory) { if (inv.Value.Name == item) { @@ -7000,7 +7021,7 @@ namespace OpenSim.Region.ScriptEngine.Common { m_host.AddScriptLPS(1); - World.SimChatBroadcast(Helpers.StringToField(msg), ChatTypeEnum.Owner, 0, m_host.AbsolutePosition, m_host.Name, m_host.UUID, false); + World.SimChatBroadcast(Utils.StringToBytes(msg), ChatTypeEnum.Owner, 0, m_host.AbsolutePosition, m_host.Name, m_host.UUID, false); // IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface(); // wComm.DeliverMessage(ChatTypeEnum.Owner, 0, m_host.Name, m_host.UUID, msg); } @@ -7021,7 +7042,7 @@ namespace OpenSim.Region.ScriptEngine.Common if (info == null) { // ScriptSleep(1000); - return LLUUID.Zero.ToString(); + return UUID.Zero.ToString(); } reply = new LSL_Types.Vector3( info.RegionLocX * Constants.RegionSize, @@ -7038,7 +7059,7 @@ namespace OpenSim.Region.ScriptEngine.Common if (info == null) { // ScriptSleep(1000); - return LLUUID.Zero.ToString(); + return UUID.Zero.ToString(); } int access = info.RegionSettings.Maturity; if (access == 0) @@ -7053,11 +7074,11 @@ namespace OpenSim.Region.ScriptEngine.Common break; default: // ScriptSleep(1000); - return LLUUID.Zero.ToString(); // Raise no event + return UUID.Zero.ToString(); // Raise no event } - LLUUID rq = LLUUID.Random(); + UUID rq = UUID.Random(); - LLUUID tid = m_ScriptEngine.m_ASYNCLSLCommandManager. + UUID tid = m_ScriptEngine.m_ASYNCLSLCommandManager. m_Dataserver.RegisterRequest(m_localID, m_itemID, rq.ToString()); m_ScriptEngine.m_ASYNCLSLCommandManager. @@ -7069,7 +7090,7 @@ namespace OpenSim.Region.ScriptEngine.Common catch(Exception e) { Console.WriteLine(e.ToString()); - return LLUUID.Zero.ToString(); + return UUID.Zero.ToString(); } } @@ -7082,8 +7103,8 @@ namespace OpenSim.Region.ScriptEngine.Common public double llGetObjectMass(string id) { m_host.AddScriptLPS(1); - LLUUID key = new LLUUID(); - if (LLUUID.TryParse(id,out key)) + UUID key = new UUID(); + if (UUID.TryParse(id,out key)) { return (double)World.GetSceneObjectPart(World.Entities[key].LocalId).GetMass(); } @@ -7175,7 +7196,7 @@ namespace OpenSim.Region.ScriptEngine.Common public void llLoadURL(string avatar_id, string message, string url) { m_host.AddScriptLPS(1); - LLUUID avatarId = new LLUUID(avatar_id); + UUID avatarId = new UUID(avatar_id); m_ScriptEngine.World.SendUrlToUser(avatarId, m_host.Name, m_host.UUID, m_host.ObjectOwner, false, message, url); // ScriptSleep(10000); @@ -7321,7 +7342,7 @@ namespace OpenSim.Region.ScriptEngine.Common public LSL_Types.LSLInteger llGetInventoryType(string name) { m_host.AddScriptLPS(1); - foreach (KeyValuePair inv in m_host.TaskInventory) + foreach (KeyValuePair inv in m_host.TaskInventory) { if (inv.Value.Name == name) { @@ -7350,10 +7371,10 @@ namespace OpenSim.Region.ScriptEngine.Common public LSL_Types.Vector3 llGetCameraPos() { m_host.AddScriptLPS(1); - LLUUID invItemID=InventorySelf(); - if (invItemID == LLUUID.Zero) + UUID invItemID=InventorySelf(); + if (invItemID == UUID.Zero) return new LSL_Types.Vector3(); - if (m_host.TaskInventory[invItemID].PermsGranter == LLUUID.Zero) + if (m_host.TaskInventory[invItemID].PermsGranter == UUID.Zero) return new LSL_Types.Vector3(); if ((m_host.TaskInventory[invItemID].PermsMask & BuiltIn_Commands_BaseClass.PERMISSION_TRACK_CAMERA) == 0) { @@ -7363,7 +7384,10 @@ namespace OpenSim.Region.ScriptEngine.Common ScenePresence presence = World.GetScenePresence(m_host.OwnerID); if (presence != null) { - LSL_Types.Vector3 pos = new LSL_Types.Vector3(presence.CameraPosition.x,presence.CameraPosition.y,presence.CameraPosition.z); + LSL_Types.Vector3 pos = new LSL_Types.Vector3( + presence.CameraPosition.X, + presence.CameraPosition.Y, + presence.CameraPosition.Z); return pos; } return new LSL_Types.Vector3(); @@ -7426,12 +7450,12 @@ namespace OpenSim.Region.ScriptEngine.Common public void llAddToLandBanList(string avatar, double hours) { m_host.AddScriptLPS(1); - LLUUID key; + UUID key; LandData land = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).landData; if (land.OwnerID == m_host.OwnerID) { ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry(); - if (LLUUID.TryParse(avatar, out key)) + if (UUID.TryParse(avatar, out key)) { entry.AgentID = key; entry.Flags = ParcelManager.AccessList.Ban; @@ -7445,11 +7469,11 @@ namespace OpenSim.Region.ScriptEngine.Common public void llRemoveFromLandPassList(string avatar) { m_host.AddScriptLPS(1); - LLUUID key; + UUID key; LandData land = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).landData; if (land.OwnerID == m_host.OwnerID) { - if (LLUUID.TryParse(avatar, out key)) + if (UUID.TryParse(avatar, out key)) { foreach (ParcelManager.ParcelAccessEntry entry in land.ParcelAccessList) { @@ -7467,11 +7491,11 @@ namespace OpenSim.Region.ScriptEngine.Common public void llRemoveFromLandBanList(string avatar) { m_host.AddScriptLPS(1); - LLUUID key; + UUID key; LandData land = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).landData; if (land.OwnerID == m_host.OwnerID) { - if (LLUUID.TryParse(avatar, out key)) + if (UUID.TryParse(avatar, out key)) { foreach (ParcelManager.ParcelAccessEntry entry in land.ParcelAccessList) { @@ -7491,16 +7515,16 @@ namespace OpenSim.Region.ScriptEngine.Common m_host.AddScriptLPS(1); // our key in the object we are in - LLUUID invItemID=InventorySelf(); - if (invItemID == LLUUID.Zero) return; + UUID invItemID=InventorySelf(); + if (invItemID == UUID.Zero) return; // the object we are in - LLUUID objectID = m_host.ParentUUID; - if (objectID == LLUUID.Zero) return; + UUID objectID = m_host.ParentUUID; + if(objectID == UUID.Zero) return; // we need the permission first, to know which avatar we want to set the camera for - LLUUID agentID = m_host.TaskInventory[invItemID].PermsGranter; - if (agentID == LLUUID.Zero) return; + UUID agentID = m_host.TaskInventory[invItemID].PermsGranter; + if (agentID == UUID.Zero) return; if ((m_host.TaskInventory[invItemID].PermsMask & BuiltIn_Commands_BaseClass.PERMISSION_CONTROL_CAMERA) == 0) return; ScenePresence presence = World.GetScenePresence(agentID); @@ -7542,16 +7566,16 @@ namespace OpenSim.Region.ScriptEngine.Common m_host.AddScriptLPS(1); // our key in the object we are in - LLUUID invItemID=InventorySelf(); - if (invItemID == LLUUID.Zero) return; + UUID invItemID=InventorySelf(); + if (invItemID == UUID.Zero) return; // the object we are in - LLUUID objectID = m_host.ParentUUID; - if (objectID == LLUUID.Zero) return; + UUID objectID = m_host.ParentUUID; + if(objectID == UUID.Zero) return; // we need the permission first, to know which avatar we want to clear the camera for - LLUUID agentID = m_host.TaskInventory[invItemID].PermsGranter; - if (agentID == LLUUID.Zero) return; + UUID agentID = m_host.TaskInventory[invItemID].PermsGranter; + if (agentID == UUID.Zero) return; if ((m_host.TaskInventory[invItemID].PermsMask & BuiltIn_Commands_BaseClass.PERMISSION_CONTROL_CAMERA) == 0) return; ScenePresence presence = World.GetScenePresence(agentID); @@ -7650,9 +7674,9 @@ namespace OpenSim.Region.ScriptEngine.Common param.Add(o.ToString()); } - LLVector3 position = m_host.AbsolutePosition; - LLVector3 velocity = m_host.Velocity; - LLQuaternion rotation = m_host.RotationOffset; + Vector3 position = m_host.AbsolutePosition; + Vector3 velocity = m_host.Velocity; + Quaternion rotation = m_host.RotationOffset; ScenePresence scenePresence = World.GetScenePresence(m_host.ObjectOwner); RegionInfo regionInfo = World.RegionInfo; @@ -7668,10 +7692,10 @@ namespace OpenSim.Region.ScriptEngine.Common httpHeaders["X-SecondLife-Owner-Name"] = scenePresence == null ? string.Empty : scenePresence.ControllingClient.Name; httpHeaders["X-SecondLife-Owner-Key"] = m_host.ObjectOwner.ToString(); - LLUUID reqID = httpScriptMod. + UUID reqID = httpScriptMod. StartHttpRequest(m_localID, m_itemID, url, param, httpHeaders, body); - if (reqID != LLUUID.Zero) + if (reqID != UUID.Zero) return reqID.ToString(); else return null; @@ -7781,7 +7805,7 @@ namespace OpenSim.Region.ScriptEngine.Common LSL_Types.list ret = new LSL_Types.list(); if (land != null) { - foreach (KeyValuePair d in land.getLandObjectOwners()) + foreach (KeyValuePair d in land.getLandObjectOwners()) { ret.Add(d.Key.ToString()); ret.Add(d.Value); @@ -7794,7 +7818,7 @@ namespace OpenSim.Region.ScriptEngine.Common public LSL_Types.LSLInteger llGetObjectPrimCount(string object_id) { m_host.AddScriptLPS(1); - SceneObjectPart part = World.GetSceneObjectPart(new LLUUID(object_id)); + SceneObjectPart part = World.GetSceneObjectPart(new UUID(object_id)); if (part == null) { return 0; @@ -7900,8 +7924,8 @@ namespace OpenSim.Region.ScriptEngine.Common { m_host.AddScriptLPS(1); LSL_Types.list ret = new LSL_Types.list(); - LLUUID key = new LLUUID(); - if (LLUUID.TryParse(id, out key)) + UUID key = new UUID(); + if (UUID.TryParse(id, out key)) { ScenePresence av = World.GetScenePresence(key); @@ -7921,19 +7945,19 @@ namespace OpenSim.Region.ScriptEngine.Common ret.Add(new LSL_Types.Vector3((double)av.AbsolutePosition.X, (double)av.AbsolutePosition.Y, (double)av.AbsolutePosition.Z)); break; case "4": - ret.Add(new LSL_Types.Quaternion((double)av.Rotation.x, (double)av.Rotation.y, (double)av.Rotation.z, (double)av.Rotation.w)); + ret.Add(new LSL_Types.Quaternion((double)av.Rotation.X, (double)av.Rotation.Y, (double)av.Rotation.Z, (double)av.Rotation.W)); break; case "5": - ret.Add(new LSL_Types.Vector3(av.Velocity.X,av.Velocity.Y,av.Velocity.Z)); + ret.Add(new LSL_Types.Vector3(av.Velocity.X, av.Velocity.Y, av.Velocity.Z)); break; case "6": ret.Add(id); break; case "7": - ret.Add(LLUUID.Zero.ToString()); + ret.Add(UUID.Zero.ToString()); break; case "8": - ret.Add(LLUUID.Zero.ToString()); + ret.Add(UUID.Zero.ToString()); break; } } @@ -7953,7 +7977,7 @@ namespace OpenSim.Region.ScriptEngine.Common ret.Add(obj.Description); break; case "3": - ret.Add(new LSL_Types.Vector3(obj.AbsolutePosition.X,obj.AbsolutePosition.Y,obj.AbsolutePosition.Z)); + ret.Add(new LSL_Types.Vector3(obj.AbsolutePosition.X, obj.AbsolutePosition.Y, obj.AbsolutePosition.Z)); break; case "4": ret.Add(new LSL_Types.Quaternion(obj.RotationOffset.X, obj.RotationOffset.Y, obj.RotationOffset.Z, obj.RotationOffset.W)); @@ -7979,14 +8003,14 @@ namespace OpenSim.Region.ScriptEngine.Common } - internal LLUUID ScriptByName(string name) + internal UUID ScriptByName(string name) { foreach (TaskInventoryItem item in m_host.TaskInventory.Values) { if (item.Type == 10 && item.Name == name) return item.ItemID; } - return LLUUID.Zero; + return UUID.Zero; } internal void ShoutError(string msg) @@ -8063,7 +8087,7 @@ namespace OpenSim.Region.ScriptEngine.Common String[] notecardLines = { "0" }; notecardLines[0] = String.Empty; - foreach (KeyValuePair inv in m_host.TaskInventory) + foreach (KeyValuePair inv in m_host.TaskInventory) { if ((inv.Value.Name == name) && (inv.Value.InvType == (int)InventoryType.Notecard)) { diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs index 581b820..8c24ae3 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs @@ -123,7 +123,7 @@ namespace OpenSim.Region.ScriptEngine.Common Vector3 vector = (Vector3)o; - return (x == vector.x && x == vector.x && z == vector.z); + return (x == vector.x && y == vector.y && z == vector.y); } public static Vector3 operator -(Vector3 vector) diff --git a/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs index 687d5e1..b410eec 100644 --- a/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs @@ -25,8 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ using System; -using Axiom.Math; -using libsecondlife; +using OpenMetaverse; using Nini.Config; using OpenSim.Framework.Console; using OpenSim.Region.Environment.Interfaces; @@ -40,7 +39,7 @@ namespace OpenSim.Region.ScriptEngine.Common public class OSSL_BuilIn_Commands : LSL_BuiltIn_Commands, OSSL_BuilIn_Commands_Interface { public OSSL_BuilIn_Commands(ScriptEngineBase.ScriptEngine scriptEngine, SceneObjectPart host, uint localID, - LLUUID itemID) + UUID itemID) : base(scriptEngine, host, localID, itemID) { Prim = new OSSLPrim(this); @@ -259,7 +258,7 @@ namespace OpenSim.Region.ScriptEngine.Common if (x > 255 || x < 0 || y > 255 || y < 0) LSLError("osTerrainSetHeight: Coordinate out of bounds"); - if (World.ExternalChecks.ExternalChecksCanTerraformLand(m_host.OwnerID, new LLVector3(x, y, 0))) + if (World.ExternalChecks.ExternalChecksCanTerraformLand(m_host.OwnerID, new Vector3(x, y, 0))) { World.Heightmap[x, y] = val; return 1; @@ -299,7 +298,7 @@ namespace OpenSim.Region.ScriptEngine.Common World.SendGeneralAlert(msg); } - public void osSetRot(LLUUID target, Quaternion rotation) + public void osSetRot(UUID target, Quaternion rotation) { m_host.AddScriptLPS(1); if (World.Entities.ContainsKey(target)) @@ -319,7 +318,7 @@ namespace OpenSim.Region.ScriptEngine.Common if (dynamicID == String.Empty) { IDynamicTextureManager textureManager = World.RequestModuleInterface(); - LLUUID createdTexture = + UUID createdTexture = textureManager.AddDynamicTextureURL(World.RegionInfo.RegionID, m_host.UUID, contentType, url, extraParams, timer); return createdTexture.ToString(); @@ -329,7 +328,7 @@ namespace OpenSim.Region.ScriptEngine.Common //TODO update existing dynamic textures } - return LLUUID.Zero.ToString(); + return UUID.Zero.ToString(); } public string osSetDynamicTextureURLBlend(string dynamicID, string contentType, string url, string extraParams, @@ -339,7 +338,7 @@ namespace OpenSim.Region.ScriptEngine.Common if (dynamicID == String.Empty) { IDynamicTextureManager textureManager = World.RequestModuleInterface(); - LLUUID createdTexture = + UUID createdTexture = textureManager.AddDynamicTextureURL(World.RegionInfo.RegionID, m_host.UUID, contentType, url, extraParams, timer, true, (byte) alpha); return createdTexture.ToString(); @@ -349,7 +348,7 @@ namespace OpenSim.Region.ScriptEngine.Common //TODO update existing dynamic textures } - return LLUUID.Zero.ToString(); + return UUID.Zero.ToString(); } public string osSetDynamicTextureData(string dynamicID, string contentType, string data, string extraParams, @@ -361,7 +360,7 @@ namespace OpenSim.Region.ScriptEngine.Common IDynamicTextureManager textureManager = World.RequestModuleInterface(); if (textureManager != null) { - LLUUID createdTexture = + UUID createdTexture = textureManager.AddDynamicTextureData(World.RegionInfo.RegionID, m_host.UUID, contentType, data, extraParams, timer); return createdTexture.ToString(); @@ -372,7 +371,7 @@ namespace OpenSim.Region.ScriptEngine.Common //TODO update existing dynamic textures } - return LLUUID.Zero.ToString(); + return UUID.Zero.ToString(); } public string osSetDynamicTextureDataBlend(string dynamicID, string contentType, string data, string extraParams, @@ -384,7 +383,7 @@ namespace OpenSim.Region.ScriptEngine.Common IDynamicTextureManager textureManager = World.RequestModuleInterface(); if (textureManager != null) { - LLUUID createdTexture = + UUID createdTexture = textureManager.AddDynamicTextureData(World.RegionInfo.RegionID, m_host.UUID, contentType, data, extraParams, timer, true, (byte) alpha); return createdTexture.ToString(); @@ -395,7 +394,7 @@ namespace OpenSim.Region.ScriptEngine.Common //TODO update existing dynamic textures } - return LLUUID.Zero.ToString(); + return UUID.Zero.ToString(); } public bool osConsoleCommand(string command) @@ -538,8 +537,8 @@ namespace OpenSim.Region.ScriptEngine.Common IXMLRPC xmlrpcMod = m_ScriptEngine.World.RequestModuleInterface(); if (xmlrpcMod.IsEnabled()) { - LLUUID channelID = xmlrpcMod.OpenXMLRPCChannel(m_localID, m_itemID, new LLUUID(channel)); - object[] resobj = new object[] { new LSL_Types.LSLInteger(1), new LSL_Types.LSLString(channelID.ToString()), new LSL_Types.LSLString(LLUUID.Zero.ToString()), new LSL_Types.LSLString(String.Empty), new LSL_Types.LSLInteger(0), new LSL_Types.LSLString(String.Empty) }; + UUID channelID = xmlrpcMod.OpenXMLRPCChannel(m_localID, m_itemID, new UUID(channel)); + object[] resobj = new object[] { new LSL_Types.LSLInteger(1), new LSL_Types.LSLString(channelID.ToString()), new LSL_Types.LSLString(UUID.Zero.ToString()), new LSL_Types.LSLString(String.Empty), new LSL_Types.LSLInteger(0), new LSL_Types.LSLString(String.Empty) }; m_ScriptEngine.m_EventQueueManager.AddToScriptQueue(m_localID, m_itemID, "remote_data", EventQueueManager.llDetectNull, resobj); } } diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandManager.cs index 64f6970..ee86500 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandManager.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandManager.cs @@ -27,7 +27,7 @@ using System.Collections; using System.Threading; -using libsecondlife; +using OpenMetaverse; using OpenSim.Framework; using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugins; @@ -153,7 +153,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase /// /// /// - public void RemoveScript(uint localID, LLUUID itemID) + public void RemoveScript(uint localID, UUID itemID) { // Remove a specific script diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Dataserver.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Dataserver.cs index 77cc7ea..378610a 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Dataserver.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Dataserver.cs @@ -28,7 +28,7 @@ using System; using System.Collections; using System.Collections.Generic; -using libsecondlife; +using OpenMetaverse; namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugins @@ -48,28 +48,28 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugin private class DataserverRequest { public uint localID; - public LLUUID itemID; + public UUID itemID; - public LLUUID ID; + public UUID ID; public string handle; public DateTime startTime; } - public LLUUID RegisterRequest(uint localID, LLUUID itemID, + public UUID RegisterRequest(uint localID, UUID itemID, string identifier) { lock (DataserverRequests) { if (DataserverRequests.ContainsKey(identifier)) - return LLUUID.Zero; + return UUID.Zero; DataserverRequest ds = new DataserverRequest(); ds.localID = localID; ds.itemID = itemID; - ds.ID = LLUUID.Random(); + ds.ID = UUID.Random(); ds.handle = identifier; ds.startTime = DateTime.Now; @@ -99,7 +99,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugin new LSL_Types.LSLString(reply)}); } - public void RemoveEvents(uint localID, LLUUID itemID) + public void RemoveEvents(uint localID, UUID itemID) { lock (DataserverRequests) { diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs index 9b636fd..0fce1f2 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs @@ -27,7 +27,7 @@ //#define SPAM using System; using System.Collections.Generic; -using libsecondlife; +using OpenMetaverse; using OpenSim.Framework; using OpenSim.Region.Environment.Scenes; using OpenSim.Framework.Communications.Cache; @@ -43,8 +43,8 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugin m_CmdManager = CmdManager; } - public Dictionary> SenseEvents = - new Dictionary>(); + public Dictionary> SenseEvents = + new Dictionary>(); private Object SenseLock = new Object(); // @@ -53,12 +53,12 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugin private class SenseRepeatClass { public uint localID; - public LLUUID itemID; + public UUID itemID; public double interval; public DateTime next; public string name; - public LLUUID keyID; + public UUID keyID; public int type; public double range; public double arc; @@ -68,8 +68,8 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugin private List SenseRepeaters = new List(); private object SenseRepeatListLock = new object(); - public void SetSenseRepeatEvent(uint m_localID, LLUUID m_itemID, - string name, LLUUID keyID, int type, double range, double arc, double sec, SceneObjectPart host) + public void SetSenseRepeatEvent(uint m_localID, UUID m_itemID, + string name, UUID keyID, int type, double range, double arc, double sec, SceneObjectPart host) { #if SPAM Console.WriteLine("SetSensorEvent"); @@ -98,7 +98,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugin } } - public void UnSetSenseRepeaterEvents(uint m_localID, LLUUID m_itemID) + public void UnSetSenseRepeaterEvents(uint m_localID, UUID m_itemID) { // Remove from timer lock (SenseRepeatListLock) @@ -138,8 +138,8 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugin } // lock } - public void SenseOnce(uint m_localID, LLUUID m_itemID, - string name, LLUUID keyID, int type, + public void SenseOnce(uint m_localID, UUID m_itemID, + string name, UUID keyID, int type, double range, double arc, SceneObjectPart host) { // Add to timer @@ -156,11 +156,11 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugin SensorSweep(ts); } - public LSL_Types.list GetSensorList(uint m_localID, LLUUID m_itemID) + public LSL_Types.list GetSensorList(uint m_localID, UUID m_itemID) { lock (SenseLock) { - Dictionary Obj = null; + Dictionary Obj = null; if (!SenseEvents.TryGetValue(m_localID, out Obj)) { #if SPAM @@ -199,11 +199,11 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugin } //m_ScriptEngine.Log.Info("[AsyncLSL]: Enter SensorSweep Scan"); - LLVector3 sensorPos = SensePoint.AbsolutePosition; - LLVector3 regionPos = new LLVector3(m_CmdManager.m_ScriptEngine.World.RegionInfo.RegionLocX * Constants.RegionSize, m_CmdManager.m_ScriptEngine.World.RegionInfo.RegionLocY * Constants.RegionSize, 0); - LLVector3 fromRegionPos = sensorPos + regionPos; + Vector3 sensorPos = SensePoint.AbsolutePosition; + Vector3 regionPos = new Vector3(m_CmdManager.m_ScriptEngine.World.RegionInfo.RegionLocX * Constants.RegionSize, m_CmdManager.m_ScriptEngine.World.RegionInfo.RegionLocY * Constants.RegionSize, 0); + Vector3 fromRegionPos = sensorPos + regionPos; - LLQuaternion q = SensePoint.RotationOffset; + Quaternion q = SensePoint.RotationOffset; LSL_Types.Quaternion r = new LSL_Types.Quaternion(q.X, q.Y, q.Z, q.W); LSL_Types.Vector3 forward_dir = (new LSL_Types.Vector3(1, 0, 0) * r); double mag_fwd = LSL_Types.Vector3.Mag(forward_dir); @@ -215,7 +215,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugin foreach (EntityBase ent in m_CmdManager.m_ScriptEngine.World.Entities.Values) { - LLVector3 toRegionPos = ent.AbsolutePosition + regionPos; + Vector3 toRegionPos = ent.AbsolutePosition + regionPos; double dis = Math.Abs((double)Util.GetDistanceTo(toRegionPos, fromRegionPos)); if (dis <= ts.range) { @@ -248,7 +248,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugin double ang_obj = 0; try { - LLVector3 diff = toRegionPos - fromRegionPos; + Vector3 diff = toRegionPos - fromRegionPos; LSL_Types.Vector3 obj_dir = new LSL_Types.Vector3(diff.X, diff.Y, diff.Z); double dot = LSL_Types.Vector3.Dot(forward_dir, obj_dir); double mag_obj = LSL_Types.Vector3.Mag(obj_dir); @@ -261,7 +261,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugin if (ang_obj > ts.arc) keep = false; } - if (keep && (ts.keyID != LLUUID.Zero) && (ts.keyID != ent.UUID)) + if (keep && (ts.keyID != UUID.Zero) && (ts.keyID != ent.UUID)) { keep = false; } @@ -303,10 +303,10 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugin // Create object if it doesn't exist if (SenseEvents.ContainsKey(ts.localID) == false) { - SenseEvents.Add(ts.localID, new Dictionary()); + SenseEvents.Add(ts.localID, new Dictionary()); } // clear if previous traces exist - Dictionary Obj; + Dictionary Obj; SenseEvents.TryGetValue(ts.localID, out Obj); if (Obj.ContainsKey(ts.itemID) == true) Obj.Remove(ts.itemID); diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Timer.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Timer.cs index 09af34a..7940b36 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Timer.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Timer.cs @@ -28,7 +28,7 @@ using System; using System.Collections; using System.Collections.Generic; -using libsecondlife; +using OpenMetaverse; namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugins { @@ -47,7 +47,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugin private class TimerClass { public uint localID; - public LLUUID itemID; + public UUID itemID; //public double interval; public long interval; //public DateTime next; @@ -57,7 +57,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugin private List Timers = new List(); private object TimerListLock = new object(); - public void SetTimerEvent(uint m_localID, LLUUID m_itemID, double sec) + public void SetTimerEvent(uint m_localID, UUID m_itemID, double sec) { // Console.WriteLine("SetTimerEvent"); @@ -82,7 +82,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugin } } - public void UnSetTimerEvents(uint m_localID, LLUUID m_itemID) + public void UnSetTimerEvents(uint m_localID, UUID m_itemID) { // Remove from timer lock (TimerListLock) diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs index 3fdfd8a..89d7045 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs @@ -27,7 +27,7 @@ using System; using System.Collections.Generic; -using libsecondlife; +using OpenMetaverse; using OpenSim.Framework; using OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney; using OpenSim.Region.Environment; @@ -96,7 +96,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase { } - private void HandleObjectPaid(LLUUID objectID, LLUUID agentID, int amount) + private void HandleObjectPaid(UUID objectID, UUID agentID, int amount) { SceneObjectPart part=myScriptEngine.World.GetSceneObjectPart(objectID); if (part != null) @@ -117,7 +117,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase myScriptEngine.m_EventQueueManager.AddToObjectQueue(localID, "state_entry", EventQueueManager.llDetectNull, new object[] { }); } - public void touch_start(uint localID, uint originalID, LLVector3 offsetPos, IClientAPI remoteClient) + public void touch_start(uint localID, uint originalID, Vector3 offsetPos, IClientAPI remoteClient) { // Add to queue for all scripts in ObjectID object EventQueueManager.Queue_llDetectParams_Struct detstruct = new EventQueueManager.Queue_llDetectParams_Struct(); @@ -135,7 +135,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase detstruct._key2[0] = new LSL_Types.key(remoteClient.AgentId.ToString()); detstruct._string[0] = remoteClient.Name; detstruct._int[0] = 0; - detstruct._Quaternion[0] = new LSL_Types.Quaternion(av.Rotation.x,av.Rotation.y,av.Rotation.z,av.Rotation.w); + detstruct._Quaternion[0] = new LSL_Types.Quaternion(av.Rotation.X,av.Rotation.Y,av.Rotation.Z,av.Rotation.W); detstruct._Vector3[0] = new LSL_Types.Vector3(av.AbsolutePosition.X,av.AbsolutePosition.Y,av.AbsolutePosition.Z); detstruct._Vector32[0] = new LSL_Types.Vector3(av.Velocity.X,av.Velocity.Y,av.Velocity.Z); } @@ -170,7 +170,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase detstruct._key2[0] = new LSL_Types.key(remoteClient.AgentId.ToString()); detstruct._string[0] = remoteClient.Name; detstruct._int[0] = 0; - detstruct._Quaternion[0] = new LSL_Types.Quaternion(av.Rotation.x, av.Rotation.y, av.Rotation.z, av.Rotation.w); + detstruct._Quaternion[0] = new LSL_Types.Quaternion(av.Rotation.X, av.Rotation.Y, av.Rotation.Z, av.Rotation.W); detstruct._Vector3[0] = new LSL_Types.Vector3(av.AbsolutePosition.X, av.AbsolutePosition.Y, av.AbsolutePosition.Z); detstruct._Vector32[0] = new LSL_Types.Vector3(av.Velocity.X, av.Velocity.Y, av.Velocity.Z); } @@ -187,14 +187,14 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase myScriptEngine.m_EventQueueManager.AddToObjectQueue(localID, "touch_end", detstruct, new object[] { new LSL_Types.LSLInteger(1) }); } - public void OnRezScript(uint localID, LLUUID itemID, string script, int startParam, bool postOnRez) + public void OnRezScript(uint localID, UUID itemID, string script, int startParam, bool postOnRez) { myScriptEngine.Log.Debug("OnRezScript localID: " + localID + " LLUID: " + itemID.ToString() + " Size: " + script.Length); myScriptEngine.m_ScriptManager.StartScript(localID, itemID, script, startParam, postOnRez); } - public void OnRemoveScript(uint localID, LLUUID itemID) + public void OnRemoveScript(uint localID, UUID itemID) { myScriptEngine.Log.Debug("OnRemoveScript localID: " + localID + " LLUID: " + itemID.ToString()); myScriptEngine.m_ScriptManager.StopScript( @@ -203,7 +203,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase ); } - public void money(uint localID, LLUUID agentID, int amount) + public void money(uint localID, UUID agentID, int amount) { myScriptEngine.m_EventQueueManager.AddToObjectQueue(localID, "money", EventQueueManager.llDetectNull, new object[] { new LSL_Types.LSLString(agentID.ToString()), new LSL_Types.LSLInteger(amount) }); } @@ -220,12 +220,12 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase myScriptEngine.m_EventQueueManager.AddToObjectQueue(localID, "state_exit", EventQueueManager.llDetectNull, new object[] { }); } - public void touch(uint localID, uint originalID, LLUUID itemID) + public void touch(uint localID, uint originalID, UUID itemID) { myScriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, "touch", EventQueueManager.llDetectNull); } - public void touch_end(uint localID, uint originalID, LLUUID itemID) + public void touch_end(uint localID, uint originalID, UUID itemID) { myScriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, "touch_end", EventQueueManager.llDetectNull, new object[] { new LSL_Types.LSLInteger(1) }); } @@ -314,7 +314,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase myScriptEngine.m_EventQueueManager.AddToObjectQueue(localID, "collision_end", EventQueueManager.llDetectNull, new object[] { new LSL_Types.LSLInteger(col.Colliders.Count) }); } - public void land_collision_start(uint localID, LLUUID itemID) + public void land_collision_start(uint localID, UUID itemID) { myScriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, "land_collision_start", EventQueueManager.llDetectNull); } @@ -324,48 +324,48 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase myScriptEngine.m_EventQueueManager.AddToObjectQueue(localID, "land_collision", EventQueueManager.llDetectNull); } - public void land_collision_end(uint localID, LLUUID itemID) + public void land_collision_end(uint localID, UUID itemID) { myScriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, "land_collision_end", EventQueueManager.llDetectNull); } // Handled by long commands - public void timer(uint localID, LLUUID itemID) + public void timer(uint localID, UUID itemID) { //myScriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, String.Empty); } - public void listen(uint localID, LLUUID itemID) + public void listen(uint localID, UUID itemID) { myScriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, "listen", EventQueueManager.llDetectNull); } - public void on_rez(uint localID, LLUUID itemID) + public void on_rez(uint localID, UUID itemID) { myScriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, "on_rez", EventQueueManager.llDetectNull); } - public void sensor(uint localID, LLUUID itemID) + public void sensor(uint localID, UUID itemID) { myScriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, "sensor", EventQueueManager.llDetectNull); } - public void no_sensor(uint localID, LLUUID itemID) + public void no_sensor(uint localID, UUID itemID) { myScriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, "no_sensor", EventQueueManager.llDetectNull); } - public void control(uint localID, LLUUID itemID, LLUUID agentID, uint held, uint change) + public void control(uint localID, UUID itemID, UUID agentID, uint held, uint change) { myScriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, "control", EventQueueManager.llDetectNull, new object[] { new LSL_Types.LSLString(agentID.ToString()), new LSL_Types.LSLInteger(held), new LSL_Types.LSLInteger(change)}); } - public void email(uint localID, LLUUID itemID) + public void email(uint localID, UUID itemID) { myScriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, "email", EventQueueManager.llDetectNull); } - public void at_target(uint localID, uint handle, LLVector3 targetpos, LLVector3 atpos) + public void at_target(uint localID, uint handle, Vector3 targetpos, Vector3 atpos) { myScriptEngine.m_EventQueueManager.AddToObjectQueue(localID, "at_target", EventQueueManager.llDetectNull, new object[] { new LSL_Types.LSLInteger(handle), new LSL_Types.Vector3(targetpos.X,targetpos.Y,targetpos.Z), new LSL_Types.Vector3(atpos.X,atpos.Y,atpos.Z) }); } @@ -375,63 +375,63 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase myScriptEngine.m_EventQueueManager.AddToObjectQueue(localID, "not_at_target", EventQueueManager.llDetectNull); } - public void at_rot_target(uint localID, LLUUID itemID) + public void at_rot_target(uint localID, UUID itemID) { myScriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, "at_rot_target", EventQueueManager.llDetectNull); } - public void not_at_rot_target(uint localID, LLUUID itemID) + public void not_at_rot_target(uint localID, UUID itemID) { myScriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, "not_at_rot_target", EventQueueManager.llDetectNull); } - public void run_time_permissions(uint localID, LLUUID itemID) + public void run_time_permissions(uint localID, UUID itemID) { myScriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, "run_time_permissions", EventQueueManager.llDetectNull); } - public void changed(uint localID, LLUUID itemID) + public void changed(uint localID, UUID itemID) { myScriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, "changed", EventQueueManager.llDetectNull); } - public void attach(uint localID, LLUUID itemID) + public void attach(uint localID, UUID itemID) { myScriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, "attach", EventQueueManager.llDetectNull); } - public void dataserver(uint localID, LLUUID itemID) + public void dataserver(uint localID, UUID itemID) { myScriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, "dataserver", EventQueueManager.llDetectNull); } - public void link_message(uint localID, LLUUID itemID) + public void link_message(uint localID, UUID itemID) { myScriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, "link_message", EventQueueManager.llDetectNull); } - public void moving_start(uint localID, LLUUID itemID) + public void moving_start(uint localID, UUID itemID) { myScriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, "moving_start", EventQueueManager.llDetectNull); } - public void moving_end(uint localID, LLUUID itemID) + public void moving_end(uint localID, UUID itemID) { myScriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, "moving_end", EventQueueManager.llDetectNull); } - public void object_rez(uint localID, LLUUID itemID) + public void object_rez(uint localID, UUID itemID) { myScriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, "object_rez", EventQueueManager.llDetectNull); } - public void remote_data(uint localID, LLUUID itemID) + public void remote_data(uint localID, UUID itemID) { myScriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, "remote_data", EventQueueManager.llDetectNull); } // Handled by long commands - public void http_response(uint localID, LLUUID itemID) + public void http_response(uint localID, UUID itemID) { // myScriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, "http_response", EventQueueManager.llDetectNull); } diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs index 5c57874..1a08795 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs @@ -28,7 +28,7 @@ using System; using System.Collections; using System.Collections.Generic; -using libsecondlife; +using OpenMetaverse; namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase { @@ -134,7 +134,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase public struct QueueItemStruct { public uint localID; - public LLUUID itemID; + public UUID itemID; public string functionName; public Queue_llDetectParams_Struct llDetectParams; public object[] param; @@ -308,10 +308,10 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase return; } - Dictionary.KeyCollection scriptKeys = + Dictionary.KeyCollection scriptKeys = m_ScriptEngine.m_ScriptManager.GetScriptKeys(localID); - foreach (LLUUID itemID in scriptKeys) + foreach (UUID itemID in scriptKeys) { // Add to each script in that object // TODO: Some scripts may not subscribe to this event. Should we NOT add it? Does it matter? @@ -326,7 +326,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase /// Region script ID /// Name of the function, will be state + "_event_" + FunctionName /// Array of parameters to match event mask - public void AddToScriptQueue(uint localID, LLUUID itemID, string FunctionName, Queue_llDetectParams_Struct qParams, params object[] param) + public void AddToScriptQueue(uint localID, UUID itemID, string FunctionName, Queue_llDetectParams_Struct qParams, params object[] param) { lock (eventQueue) { diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs index 4376e00..1e71ae5 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs @@ -31,7 +31,7 @@ using System.Reflection; using System.Text.RegularExpressions; using System.Threading; using System.Globalization; -using libsecondlife; +using OpenMetaverse; using log4net; using OpenSim.Framework; using OpenSim.Region.Environment.Scenes.Scripting; @@ -327,7 +327,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase m_ScriptEngine.World.GetSceneObjectPart(QIS.localID); //if (m_host != null) //{ - m_ScriptEngine.World.SimChat(Helpers.StringToField(text), + m_ScriptEngine.World.SimChat(Utils.StringToBytes(text), ChatTypeEnum.DebugChannel, 2147483647, m_host.AbsolutePosition, m_host.Name, m_host.UUID, false); diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs index 99bbdee..60333b1 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs @@ -31,7 +31,7 @@ using System.IO; using System.Reflection; using System.Runtime.Serialization.Formatters.Binary; using System.Threading; -using libsecondlife; +using OpenMetaverse; using OpenSim.Region.Environment.Scenes; namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase @@ -69,7 +69,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase private struct LUStruct { public uint localID; - public LLUUID itemID; + public UUID itemID; public string script; public LUType Action; public int startParam; @@ -84,13 +84,13 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase } // Xantor 20080525: Keep a list of compiled scripts this session for reuse - public Dictionary scriptList = new Dictionary(); + public Dictionary scriptList = new Dictionary(); // Object> // IMPORTANT: Types and MemberInfo-derived objects require a LOT of memory. // Instead use RuntimeTypeHandle, RuntimeFieldHandle and RunTimeHandle (IntPtr) instead! - public Dictionary> Scripts = - new Dictionary>(); + public Dictionary> Scripts = + new Dictionary>(); public Scene World @@ -254,7 +254,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase /// /// /// - public void StartScript(uint localID, LLUUID itemID, string Script, int startParam, bool postOnRez) + public void StartScript(uint localID, UUID itemID, string Script, int startParam, bool postOnRez) { lock (LUQueue) { @@ -280,7 +280,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase /// /// /// - public void StopScript(uint localID, LLUUID itemID) + public void StopScript(uint localID, UUID itemID) { LUStruct ls = new LUStruct(); ls.localID = localID; @@ -297,8 +297,8 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase // Create a new instance of the compiler (reuse) //private Compiler.LSL.Compiler LSLCompiler = new Compiler.LSL.Compiler(); - public abstract void _StartScript(uint localID, LLUUID itemID, string Script, int startParam, bool postOnRez); - public abstract void _StopScript(uint localID, LLUUID itemID); + public abstract void _StartScript(uint localID, UUID itemID, string Script, int startParam, bool postOnRez); + public abstract void _StopScript(uint localID, UUID itemID); #endregion @@ -312,7 +312,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase /// Script ID /// Name of function /// Arguments to pass to function - internal void ExecuteEvent(uint localID, LLUUID itemID, string FunctionName, EventQueueManager.Queue_llDetectParams_Struct qParams, object[] args) + internal void ExecuteEvent(uint localID, UUID itemID, string FunctionName, EventQueueManager.Queue_llDetectParams_Struct qParams, object[] args) { //cfk 2-7-08 dont need this right now and the default Linux build has DEBUG defined ///#if DEBUG @@ -335,7 +335,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase Script.Exec.ExecuteEvent(FunctionName, args); } - public int GetStateEventFlags(uint localID, LLUUID itemID) + public int GetStateEventFlags(uint localID, UUID itemID) { // Console.WriteLine("GetStateEventFlags for <" + localID + "," + itemID + ">"); try @@ -360,25 +360,25 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase #region Internal functions to keep track of script - public Dictionary.KeyCollection GetScriptKeys(uint localID) + public Dictionary.KeyCollection GetScriptKeys(uint localID) { if (Scripts.ContainsKey(localID) == false) return null; - Dictionary Obj; + Dictionary Obj; Scripts.TryGetValue(localID, out Obj); return Obj.Keys; } - public IScript GetScript(uint localID, LLUUID itemID) + public IScript GetScript(uint localID, UUID itemID) { lock (scriptLock) { if (Scripts.ContainsKey(localID) == false) return null; - Dictionary Obj; + Dictionary Obj; Scripts.TryGetValue(localID, out Obj); if (Obj.ContainsKey(itemID) == false) return null; @@ -390,18 +390,18 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase } } - public void SetScript(uint localID, LLUUID itemID, IScript Script) + public void SetScript(uint localID, UUID itemID, IScript Script) { lock (scriptLock) { // Create object if it doesn't exist if (Scripts.ContainsKey(localID) == false) { - Scripts.Add(localID, new Dictionary()); + Scripts.Add(localID, new Dictionary()); } // Delete script if it exists - Dictionary Obj; + Dictionary Obj; Scripts.TryGetValue(localID, out Obj); if (Obj.ContainsKey(itemID) == true) Obj.Remove(itemID); @@ -411,14 +411,14 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase } } - public void RemoveScript(uint localID, LLUUID itemID) + public void RemoveScript(uint localID, UUID itemID) { // Don't have that object? if (Scripts.ContainsKey(localID) == false) return; // Delete script if it exists - Dictionary Obj; + Dictionary Obj; Scripts.TryGetValue(localID, out Obj); if (Obj.ContainsKey(itemID) == true) Obj.Remove(itemID); @@ -427,21 +427,21 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase #endregion - public void ResetScript(uint localID, LLUUID itemID) + public void ResetScript(uint localID, UUID itemID) { IScript s = GetScript(localID, itemID); string script = s.Source; StopScript(localID, itemID); SceneObjectPart part = World.GetSceneObjectPart(localID); part.GetInventoryItem(itemID).PermsMask = 0; - part.GetInventoryItem(itemID).PermsGranter = LLUUID.Zero; + part.GetInventoryItem(itemID).PermsGranter = UUID.Zero; StartScript(localID, itemID, script, s.StartParam, false); } #region Script serialization/deserialization - public void GetSerializedScript(uint localID, LLUUID itemID) + public void GetSerializedScript(uint localID, UUID itemID) { // Serialize the script and return it // Should not be a problem @@ -451,7 +451,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase fs.Close(); } - public void PutSerializedScript(uint localID, LLUUID itemID) + public void PutSerializedScript(uint localID, UUID itemID) { // Deserialize the script and inject it into an AppDomain diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptServerInterfaces.cs b/OpenSim/Region/ScriptEngine/Common/ScriptServerInterfaces.cs index 41fde02..a6473ee 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptServerInterfaces.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptServerInterfaces.cs @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using libsecondlife; +using OpenMetaverse; using Nini.Config; using OpenSim.Framework; using OpenSim.Region.Environment.Scenes; @@ -38,40 +38,40 @@ namespace OpenSim.Region.ScriptEngine.Common { public interface RemoteEvents { - void touch_start(uint localID, uint originalID, LLVector3 offsetPos, IClientAPI remoteClient); - void OnRezScript(uint localID, LLUUID itemID, string script, int startParam, bool postOnRez); - void OnRemoveScript(uint localID, LLUUID itemID); + void touch_start(uint localID, uint originalID, Vector3 offsetPos, IClientAPI remoteClient); + void OnRezScript(uint localID, UUID itemID, string script, int startParam, bool postOnRez); + void OnRemoveScript(uint localID, UUID itemID); void state_exit(uint localID); - void touch(uint localID, uint originalID, LLUUID itemID); - void touch_end(uint localID, uint originalID, LLUUID itemID); + void touch(uint localID, uint originalID, UUID itemID); + void touch_end(uint localID, uint originalID, UUID itemID); void collision_start(uint localID, ColliderArgs col); void collision(uint localID, ColliderArgs col); void collision_end(uint localID, ColliderArgs col); - void land_collision_start(uint localID, LLUUID itemID); + void land_collision_start(uint localID, UUID itemID); void land_collision(uint localID, ColliderArgs col); - void land_collision_end(uint localID, LLUUID itemID); - void timer(uint localID, LLUUID itemID); - void listen(uint localID, LLUUID itemID); - void on_rez(uint localID, LLUUID itemID); - void sensor(uint localID, LLUUID itemID); - void no_sensor(uint localID, LLUUID itemID); - void control(uint localID, LLUUID itemID, LLUUID agentID, uint held, uint change); - void money(uint LocalID, LLUUID agentID, int amount); - void email(uint localID, LLUUID itemID); - void at_target(uint localID, uint handle, LLVector3 targetpos, LLVector3 atpos); + void land_collision_end(uint localID, UUID itemID); + void timer(uint localID, UUID itemID); + void listen(uint localID, UUID itemID); + void on_rez(uint localID, UUID itemID); + void sensor(uint localID, UUID itemID); + void no_sensor(uint localID, UUID itemID); + void control(uint localID, UUID itemID, UUID agentID, uint held, uint change); + void money(uint LocalID, UUID agentID, int amount); + void email(uint localID, UUID itemID); + void at_target(uint localID, uint handle, Vector3 targetpos, Vector3 atpos); void not_at_target(uint localID); - void at_rot_target(uint localID, LLUUID itemID); - void not_at_rot_target(uint localID, LLUUID itemID); - void run_time_permissions(uint localID, LLUUID itemID); - void changed(uint localID, LLUUID itemID); - void attach(uint localID, LLUUID itemID); - void dataserver(uint localID, LLUUID itemID); - void link_message(uint localID, LLUUID itemID); - void moving_start(uint localID, LLUUID itemID); - void moving_end(uint localID, LLUUID itemID); - void object_rez(uint localID, LLUUID itemID); - void remote_data(uint localID, LLUUID itemID); - void http_response(uint localID, LLUUID itemID); + void at_rot_target(uint localID, UUID itemID); + void not_at_rot_target(uint localID, UUID itemID); + void run_time_permissions(uint localID, UUID itemID); + void changed(uint localID, UUID itemID); + void attach(uint localID, UUID itemID); + void dataserver(uint localID, UUID itemID); + void link_message(uint localID, UUID itemID); + void moving_start(uint localID, UUID itemID); + void moving_end(uint localID, UUID itemID); + void object_rez(uint localID, UUID itemID); + void remote_data(uint localID, UUID itemID); + void http_response(uint localID, UUID itemID); } public interface ServerRemotingObject diff --git a/OpenSim/Region/ScriptEngine/Common/TRPC_Remote.cs b/OpenSim/Region/ScriptEngine/Common/TRPC_Remote.cs index a310978..b02f2f5 100644 --- a/OpenSim/Region/ScriptEngine/Common/TRPC_Remote.cs +++ b/OpenSim/Region/ScriptEngine/Common/TRPC_Remote.cs @@ -31,7 +31,7 @@ using System.Diagnostics; using System.Net; using System.Text; using System.Web; -using libsecondlife; +using OpenMetaverse; using OpenSim.Region.ScriptEngine.Common.TRPC; namespace OpenSim.Region.ScriptEngine.Common @@ -53,7 +53,7 @@ namespace OpenSim.Region.ScriptEngine.Common typeof(Double), typeof(Decimal), typeof(Array), - typeof(LLUUID), + typeof(UUID), typeof(UInt16), typeof(UInt32), typeof(UInt64) 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 //System.Console.WriteLine("SCRIPT:" + checkscript); // checks for alpha.alpha way of referring to objects in C# - // ignores alpha.x alpha.y, alpha.z for refering to vector components + // ignores alpha.X alpha.Y, alpha.Z for refering to vector components Match SecurityM; 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 - //internal Dictionary> Scripts = new Dictionary>(); + //internal Dictionary> Scripts = new Dictionary>(); // 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 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 GetVars(); void SetVars(Dictionary vars); DetectParams GetDetectParams(int idx); - LLUUID GetDetectID(int idx); + UUID GetDetectID(int idx); void SaveState(string assembly); } } diff --git a/OpenSim/Region/ScriptEngine/RemoteServer/EventManager.cs b/OpenSim/Region/ScriptEngine/RemoteServer/EventManager.cs index 21888fa..afb7311 100644 --- a/OpenSim/Region/ScriptEngine/RemoteServer/EventManager.cs +++ b/OpenSim/Region/ScriptEngine/RemoteServer/EventManager.cs @@ -28,7 +28,7 @@ /* Original code: Tedd Hansen */ using System; -using libsecondlife; +using OpenMetaverse; using OpenSim.Framework; using OpenSim.Region.ScriptEngine.Common; using OpenSim.Region.ScriptEngine.Common.TRPC; @@ -77,7 +77,7 @@ namespace OpenSim.Region.ScriptEngine.RemoteServer } } - public void OnRezScript(uint localID, LLUUID itemID, string script, int startParam, bool postOnRez) + public void OnRezScript(uint localID, UUID itemID, string script, int startParam, bool postOnRez) { // WE ARE CREATING A NEW SCRIPT ... CREATE SCRIPT, GET A REMOTEID THAT WE MAP FROM LOCALID myScriptEngine.Log.Info("[RemoteEngine]: Creating new script (with connection)"); @@ -90,7 +90,7 @@ namespace OpenSim.Region.ScriptEngine.RemoteServer //remoteScript[localID].Events().OnRezScript(localID, itemID, script); } - public void touch_start(uint localID, LLVector3 offsetPos, IClientAPI remoteClient) + public void touch_start(uint localID, Vector3 offsetPos, IClientAPI remoteClient) { //remoteScript[localID].Events.touch_start(localID, offsetPos, remoteClient); RPC.SendCommand(myScriptServerID, "touch_start", offsetPos, "How to transfer IClientAPI?"); @@ -100,162 +100,162 @@ namespace OpenSim.Region.ScriptEngine.RemoteServer // PLACEHOLDERS -- CODE WILL CHANGE! - //public void OnRemoveScript(uint localID, LLUUID itemID) + //public void OnRemoveScript(uint localID, UUID itemID) //{ // remoteScript[localID].Events.OnRemoveScript(localID, itemID); //} - //public void state_exit(uint localID, LLUUID itemID) + //public void state_exit(uint localID, UUID itemID) //{ // remoteScript[localID].Events.state_exit(localID, itemID); //} - //public void touch(uint localID, LLUUID itemID) + //public void touch(uint localID, UUID itemID) //{ // remoteScript[localID].Events.touch(localID, itemID); //} - //public void touch_end(uint localID, LLUUID itemID) + //public void touch_end(uint localID, UUID itemID) //{ // remoteScript[localID].Events.touch_end(localID, itemID); //} - //public void collision_start(uint localID, LLUUID itemID) + //public void collision_start(uint localID, UUID itemID) //{ // remoteScript[localID].Events.collision_start(localID, itemID); //} - //public void collision(uint localID, LLUUID itemID) + //public void collision(uint localID, UUID itemID) //{ // remoteScript[localID].Events.collision(localID, itemID); //} - //public void collision_end(uint localID, LLUUID itemID) + //public void collision_end(uint localID, UUID itemID) //{ // remoteScript[localID].Events.collision_end(localID, itemID); //} - //public void land_collision_start(uint localID, LLUUID itemID) + //public void land_collision_start(uint localID, UUID itemID) //{ // remoteScript[localID].Events.land_collision_start(localID, itemID); //} - //public void land_collision(uint localID, LLUUID itemID) + //public void land_collision(uint localID, UUID itemID) //{ // remoteScript[localID].Events.land_collision(localID, itemID); //} - //public void land_collision_end(uint localID, LLUUID itemID) + //public void land_collision_end(uint localID, UUID itemID) //{ // remoteScript[localID].Events.land_collision_end(localID, itemID); //} - //public void timer(uint localID, LLUUID itemID) + //public void timer(uint localID, UUID itemID) //{ // remoteScript[localID].Events.timer(localID, itemID); //} - //public void listen(uint localID, LLUUID itemID) + //public void listen(uint localID, UUID itemID) //{ // remoteScript[localID].Events.listen(localID, itemID); //} - //public void on_rez(uint localID, LLUUID itemID) + //public void on_rez(uint localID, UUID itemID) //{ // remoteScript[localID].Events.on_rez(localID, itemID); //} - //public void sensor(uint localID, LLUUID itemID) + //public void sensor(uint localID, UUID itemID) //{ // remoteScript[localID].Events.sensor(localID, itemID); //} - //public void no_sensor(uint localID, LLUUID itemID) + //public void no_sensor(uint localID, UUID itemID) //{ // remoteScript[localID].Events.no_sensor(localID, itemID); //} - //public void control(uint localID, LLUUID itemID) + //public void control(uint localID, UUID itemID) //{ // remoteScript[localID].Events.control(localID, itemID); //} - //public void money(uint localID, LLUUID itemID) + //public void money(uint localID, UUID itemID) //{ // remoteScript[localID].Events.money(localID, itemID); //} - //public void email(uint localID, LLUUID itemID) + //public void email(uint localID, UUID itemID) //{ // remoteScript[localID].Events.email(localID, itemID); //} - //public void at_target(uint localID, LLUUID itemID) + //public void at_target(uint localID, UUID itemID) //{ // remoteScript[localID].Events.at_target(localID, itemID); //} - //public void not_at_target(uint localID, LLUUID itemID) + //public void not_at_target(uint localID, UUID itemID) //{ // remoteScript[localID].Events.not_at_target(localID, itemID); //} - //public void at_rot_target(uint localID, LLUUID itemID) + //public void at_rot_target(uint localID, UUID itemID) //{ // remoteScript[localID].Events.at_rot_target(localID, itemID); //} - //public void not_at_rot_target(uint localID, LLUUID itemID) + //public void not_at_rot_target(uint localID, UUID itemID) //{ // remoteScript[localID].Events.not_at_rot_target(localID, itemID); //} - //public void run_time_permissions(uint localID, LLUUID itemID) + //public void run_time_permissions(uint localID, UUID itemID) //{ // remoteScript[localID].Events.run_time_permissions(localID, itemID); //} - //public void changed(uint localID, LLUUID itemID) + //public void changed(uint localID, UUID itemID) //{ // remoteScript[localID].Events.changed(localID, itemID); //} - //public void attach(uint localID, LLUUID itemID) + //public void attach(uint localID, UUID itemID) //{ // remoteScript[localID].Events.attach(localID, itemID); //} - //public void dataserver(uint localID, LLUUID itemID) + //public void dataserver(uint localID, UUID itemID) //{ // remoteScript[localID].Events.dataserver(localID, itemID); //} - //public void link_message(uint localID, LLUUID itemID) + //public void link_message(uint localID, UUID itemID) //{ // remoteScript[localID].Events.link_message(localID, itemID); //} - //public void moving_start(uint localID, LLUUID itemID) + //public void moving_start(uint localID, UUID itemID) //{ // remoteScript[localID].Events.moving_start(localID, itemID); //} - //public void moving_end(uint localID, LLUUID itemID) + //public void moving_end(uint localID, UUID itemID) //{ // remoteScript[localID].Events.moving_end(localID, itemID); //} - //public void object_rez(uint localID, LLUUID itemID) + //public void object_rez(uint localID, UUID itemID) //{ // remoteScript[localID].Events.object_rez(localID, itemID); //} - //public void remote_data(uint localID, LLUUID itemID) + //public void remote_data(uint localID, UUID itemID) //{ // remoteScript[localID].Events.remote_data(localID, itemID); //} - //public void http_response(uint localID, LLUUID itemID) + //public void http_response(uint localID, UUID itemID) //{ // remoteScript[localID].Events.http_response(localID, itemID); //} diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs index fcd1df8..93a1a80 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs @@ -29,7 +29,7 @@ using System; using System.Collections; using System.Collections.Generic; using System.Threading; -using libsecondlife; +using OpenMetaverse; using OpenSim.Framework; using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.ScriptEngine.Interfaces; @@ -192,7 +192,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api /// /// /// - public void RemoveScript(uint localID, LLUUID itemID) + public void RemoveScript(uint localID, UUID itemID) { // Remove a specific script @@ -219,7 +219,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api } - public Object[] GetSerializationData(LLUUID itemID) + public Object[] GetSerializationData(UUID itemID) { List data = new List(); @@ -250,7 +250,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api return data.ToArray(); } - public void CreateFromData(uint localID, LLUUID itemID, LLUUID hostID, + public void CreateFromData(uint localID, UUID itemID, UUID hostID, Object[] data) { int idx = 0; diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 93dfeea..b2be0df 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs @@ -32,9 +32,8 @@ using System.Runtime.Remoting.Lifetime; using System.Text; using System.Threading; using Nini.Config; -using Axiom.Math; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; using OpenSim; using OpenSim.Framework; using OpenSim.Framework.Communications.Cache; @@ -63,13 +62,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api internal IScriptEngine m_ScriptEngine; internal SceneObjectPart m_host; internal uint m_localID; - internal LLUUID m_itemID; + internal UUID m_itemID; internal bool throwErrorOnNotImplemented = true; internal AsyncCommandManager AsyncCommands = null; internal float m_ScriptDelayFactor = 1.0f; internal float m_ScriptDistanceFactor = 1.0f; - public void Initialize(IScriptEngine ScriptEngine, SceneObjectPart host, uint localID, LLUUID itemID) + public void Initialize(IScriptEngine ScriptEngine, SceneObjectPart host, uint localID, UUID itemID) { m_ScriptEngine = ScriptEngine; m_host = host; @@ -129,11 +128,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api return World.GetCommander(name); } - private LLUUID InventorySelf() + private UUID InventorySelf() { - LLUUID invItemID = new LLUUID(); + UUID invItemID = new UUID(); - foreach (KeyValuePair inv in m_host.TaskInventory) + foreach (KeyValuePair inv in m_host.TaskInventory) { if (inv.Value.Type == 10 && inv.Value.ItemID == m_itemID) { @@ -145,54 +144,54 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api return invItemID; } - private LLUUID InventoryKey(string name, int type) + private UUID InventoryKey(string name, int type) { m_host.AddScriptLPS(1); - foreach (KeyValuePair inv in m_host.TaskInventory) + foreach (KeyValuePair inv in m_host.TaskInventory) { if (inv.Value.Name == name) { if (inv.Value.Type != type) - return LLUUID.Zero; + return UUID.Zero; return inv.Value.AssetID.ToString(); } } - return LLUUID.Zero; + return UUID.Zero; } - private LLUUID InventoryKey(string name) + private UUID InventoryKey(string name) { m_host.AddScriptLPS(1); - foreach (KeyValuePair inv in m_host.TaskInventory) + foreach (KeyValuePair inv in m_host.TaskInventory) { if (inv.Value.Name == name) { return inv.Value.AssetID.ToString(); } } - return LLUUID.Zero; + return UUID.Zero; } /// - /// accepts a valid LLUUID, -or- a name of an inventory item. - /// Returns a valid LLUUID or LLUUID.Zero if key invalid and item not found + /// accepts a valid UUID, -or- a name of an inventory item. + /// Returns a valid UUID or UUID.Zero if key invalid and item not found /// in prim inventory. /// /// /// - private LLUUID KeyOrName(string k) + private UUID KeyOrName(string k) { - LLUUID key = LLUUID.Zero; + UUID key = UUID.Zero; // if we can parse the string as a key, use it. - if (LLUUID.TryParse(k, out key)) + if (UUID.TryParse(k, out key)) { return key; } // else try to locate the name in inventory of object. found returns key, - // not found returns LLUUID.Zero which will translate to the default particle texture + // not found returns UUID.Zero which will translate to the default particle texture else { return InventoryKey(k); @@ -551,7 +550,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api if (text.Length > 1023) text = text.Substring(0, 1023); - World.SimChat(Helpers.StringToField(text), + World.SimChat(Utils.StringToBytes(text), ChatTypeEnum.Whisper, channelID, m_host.AbsolutePosition, m_host.Name, m_host.UUID, false); IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface(); @@ -565,7 +564,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api if (text.Length > 1023) text = text.Substring(0, 1023); - World.SimChat(Helpers.StringToField(text), + World.SimChat(Utils.StringToBytes(text), ChatTypeEnum.Say, channelID, m_host.AbsolutePosition, m_host.Name, m_host.UUID, false); IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface(); @@ -579,7 +578,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api if (text.Length > 1023) text = text.Substring(0, 1023); - World.SimChat(Helpers.StringToField(text), + World.SimChat(Utils.StringToBytes(text), ChatTypeEnum.Shout, channelID, m_host.AbsolutePosition, m_host.Name, m_host.UUID, true); IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface(); @@ -606,8 +605,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public LSL_Types.LSLInteger llListen(int channelID, string name, string ID, string msg) { m_host.AddScriptLPS(1); - LLUUID keyID; - LLUUID.TryParse(ID, out keyID); + UUID keyID; + UUID.TryParse(ID, out keyID); IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface(); return wComm.Listen(m_localID, m_itemID, m_host.UUID, channelID, name, keyID, msg); } @@ -629,8 +628,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public void llSensor(string name, string id, int type, double range, double arc) { m_host.AddScriptLPS(1); - LLUUID keyID = LLUUID.Zero; - LLUUID.TryParse(id, out keyID); + UUID keyID = UUID.Zero; + UUID.TryParse(id, out keyID); AsyncCommands.SensorRepeatPlugin.SenseOnce(m_localID, m_itemID, name, keyID, type, range, arc, m_host); } @@ -638,8 +637,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public void llSensorRepeat(string name, string id, int type, double range, double arc, double rate) { m_host.AddScriptLPS(1); - LLUUID keyID = LLUUID.Zero; - LLUUID.TryParse(id, out keyID); + UUID keyID = UUID.Zero; + UUID.TryParse(id, out keyID); AsyncCommands.SensorRepeatPlugin.SetSenseRepeatEvent(m_localID, m_itemID, name, keyID, type, range, arc, rate, m_host); } @@ -650,7 +649,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api AsyncCommands.SensorRepeatPlugin.UnSetSenseRepeaterEvents(m_localID, m_itemID); } - public string resolveName(LLUUID objecUUID) + public string resolveName(UUID objecUUID) { // try avatar username surname CachedUserInfo profile = World.CommsManager.UserProfileCacheService.GetUserDetails(objecUUID); @@ -841,7 +840,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api if ((status & ScriptBaseClass.STATUS_CAST_SHADOWS) == ScriptBaseClass.STATUS_CAST_SHADOWS) { - m_host.AddFlag(LLObject.ObjectFlags.CastShadows); + m_host.AddFlag(PrimFlags.CastShadows); } if ((status & ScriptBaseClass.STATUS_ROTATE_X) == ScriptBaseClass.STATUS_ROTATE_X) @@ -891,25 +890,25 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public LSL_Types.LSLInteger llGetStatus(int status) { m_host.AddScriptLPS(1); - // Console.WriteLine(m_host.UUID.ToString() + " status is " + m_host.GetEffectiveObjectFlags().ToString()); + // Console.WriteLine(m_host.ToString() + " status is " + m_host.GetEffectiveObjectFlags().ToString()); switch (status) { case ScriptBaseClass.STATUS_PHYSICS: - if ((m_host.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.Physics) == (uint)LLObject.ObjectFlags.Physics) + if ((m_host.GetEffectiveObjectFlags() & (uint)PrimFlags.Physics) == (uint)PrimFlags.Physics) { return 1; } return 0; case ScriptBaseClass.STATUS_PHANTOM: - if ((m_host.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.Phantom) == (uint)LLObject.ObjectFlags.Phantom) + if ((m_host.GetEffectiveObjectFlags() & (uint)PrimFlags.Phantom) == (uint)PrimFlags.Phantom) { return 1; } return 0; case ScriptBaseClass.STATUS_CAST_SHADOWS: - if ((m_host.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.CastShadows) == (uint)LLObject.ObjectFlags.CastShadows) + if ((m_host.GetEffectiveObjectFlags() & (uint)PrimFlags.CastShadows) == (uint)PrimFlags.CastShadows) { return 1; } @@ -976,7 +975,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api scale.y = World.m_maxNonphys; if (scale.z > World.m_maxNonphys) scale.z = World.m_maxNonphys; - LLVector3 tmp = part.Scale; + Vector3 tmp = part.Scale; tmp.X = (float)scale.x; tmp.Y = (float)scale.y; tmp.Z = (float)scale.z; @@ -999,8 +998,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api private void SetColor(SceneObjectPart part, LSL_Types.Vector3 color, int face) { - LLObject.TextureEntry tex = part.Shape.Textures; - LLColor texcolor; + Primitive.TextureEntry tex = part.Shape.Textures; + Color4 texcolor; if (face > -1) { texcolor = tex.CreateFace((uint)face).RGBA; @@ -1036,7 +1035,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public void SetGlow(SceneObjectPart part, int face, float glow) { - LLObject.TextureEntry tex = part.Shape.Textures; + Primitive.TextureEntry tex = part.Shape.Textures; if (face > -1) { tex.CreateFace((uint) face); @@ -1083,7 +1082,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api break; } - LLObject.TextureEntry tex = part.Shape.Textures; + Primitive.TextureEntry tex = part.Shape.Textures; if (face > -1) { tex.CreateFace((uint) face); @@ -1111,7 +1110,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public void SetFullBright(SceneObjectPart part, int face, bool bright) { - LLObject.TextureEntry tex = part.Shape.Textures; + Primitive.TextureEntry tex = part.Shape.Textures; if (face > -1) { tex.CreateFace((uint) face); @@ -1137,7 +1136,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public double llGetAlpha(int face) { m_host.AddScriptLPS(1); - LLObject.TextureEntry tex = m_host.Shape.Textures; + Primitive.TextureEntry tex = m_host.Shape.Textures; if (face == -1) // TMP: Until we can determine number of sides, ALL_SIDES (-1) will return default color { return (double)((tex.DefaultTexture.RGBA.A * 255) / 255); @@ -1158,8 +1157,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api private void SetAlpha(SceneObjectPart part, double alpha, int face) { - LLObject.TextureEntry tex = part.Shape.Textures; - LLColor texcolor; + Primitive.TextureEntry tex = part.Shape.Textures; + Color4 texcolor; if (face > -1) { texcolor = tex.CreateFace((uint)face).RGBA; @@ -1286,8 +1285,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public LSL_Types.Vector3 llGetColor(int face) { m_host.AddScriptLPS(1); - LLObject.TextureEntry tex = m_host.Shape.Textures; - LLColor texcolor; + Primitive.TextureEntry tex = m_host.Shape.Textures; + Color4 texcolor; LSL_Types.Vector3 rgb; if (face == -1) // TMP: Until we can determine number of sides, ALL_SIDES (-1) will return default color { @@ -1320,21 +1319,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api private void SetTexture(SceneObjectPart part, string texture, int face) { - LLUUID textureID=new LLUUID(); + UUID textureID=new UUID(); - if (!LLUUID.TryParse(texture, out textureID)) + if (!UUID.TryParse(texture, out textureID)) { textureID=InventoryKey(texture, (int)AssetType.Texture); } - if (textureID == LLUUID.Zero) + if (textureID == UUID.Zero) return; - LLObject.TextureEntry tex = part.Shape.Textures; + Primitive.TextureEntry tex = part.Shape.Textures; if (face > -1) { - LLObject.TextureEntryFace texface = tex.CreateFace((uint)face); + Primitive.TextureEntryFace texface = tex.CreateFace((uint)face); texface.TextureID = textureID; tex.FaceTextures[face] = texface; part.UpdateTexture(tex); @@ -1365,10 +1364,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api private void ScaleTexture(SceneObjectPart part, double u, double v, int face) { - LLObject.TextureEntry tex = part.Shape.Textures; + Primitive.TextureEntry tex = part.Shape.Textures; if (face > -1) { - LLObject.TextureEntryFace texface = tex.CreateFace((uint)face); + Primitive.TextureEntryFace texface = tex.CreateFace((uint)face); texface.RepeatU = (float)u; texface.RepeatV = (float)v; tex.FaceTextures[face] = texface; @@ -1401,10 +1400,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api private void OffsetTexture(SceneObjectPart part, double u, double v, int face) { - LLObject.TextureEntry tex = part.Shape.Textures; + Primitive.TextureEntry tex = part.Shape.Textures; if (face > -1) { - LLObject.TextureEntryFace texface = tex.CreateFace((uint)face); + Primitive.TextureEntryFace texface = tex.CreateFace((uint)face); texface.OffsetU = (float)u; texface.OffsetV = (float)v; tex.FaceTextures[face] = texface; @@ -1437,10 +1436,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api private void RotateTexture(SceneObjectPart part, double rotation, int face) { - LLObject.TextureEntry tex = part.Shape.Textures; + Primitive.TextureEntry tex = part.Shape.Textures; if (face > -1) { - LLObject.TextureEntryFace texface = tex.CreateFace((uint)face); + Primitive.TextureEntryFace texface = tex.CreateFace((uint)face); texface.Rotation = (float)rotation; tex.FaceTextures[face] = texface; part.UpdateTexture(tex); @@ -1464,14 +1463,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public string llGetTexture(int face) { m_host.AddScriptLPS(1); - LLObject.TextureEntry tex = m_host.Shape.Textures; + Primitive.TextureEntry tex = m_host.Shape.Textures; if (face == -1) { face = 0; } if (face > -1) { - LLObject.TextureEntryFace texface; + Primitive.TextureEntryFace texface; texface = tex.GetFace((uint)face); return texface.TextureID.ToString(); } @@ -1501,11 +1500,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api if (part.ParentID != 0) { - part.UpdateOffSet(new LLVector3((float)targetPos.x, (float)targetPos.y, (float)targetPos.z)); + part.UpdateOffSet(new Vector3((float)targetPos.x, (float)targetPos.y, (float)targetPos.z)); } else { - part.UpdateGroupPosition(new LLVector3((float)targetPos.x, (float)targetPos.y, (float)targetPos.z)); + part.UpdateGroupPosition(new Vector3((float)targetPos.x, (float)targetPos.y, (float)targetPos.z)); } } @@ -1545,7 +1544,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api private void SetRot(SceneObjectPart part, LSL_Types.Quaternion rot) { - part.UpdateRotation(new LLQuaternion((float)rot.x, (float)rot.y, (float)rot.z, (float)rot.s)); + part.UpdateRotation(new Quaternion((float)rot.x, (float)rot.y, (float)rot.z, (float)rot.s)); // Update rotation does not move the object in the physics scene if it's a linkset. part.ParentGroup.AbsolutePosition = part.ParentGroup.AbsolutePosition; } @@ -1553,7 +1552,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public LSL_Types.Quaternion llGetRot() { m_host.AddScriptLPS(1); - LLQuaternion q = m_host.RotationOffset; + Quaternion q = m_host.RotationOffset; return new LSL_Types.Quaternion(q.X, q.Y, q.Z, q.W); } @@ -1605,7 +1604,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public LSL_Types.LSLInteger llTarget(LSL_Types.Vector3 position, double range) { m_host.AddScriptLPS(1); - return m_host.registerTargetWaypoint(new LLVector3((float)position.x, (float)position.y, (float)position.z), (float)range); + return m_host.registerTargetWaypoint(new Vector3((float)position.x, (float)position.y, (float)position.z), (float)range); } @@ -1631,7 +1630,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public void llMoveToTarget(LSL_Types.Vector3 target, double tau) { m_host.AddScriptLPS(1); - m_host.MoveToTarget(new LLVector3((float)target.x, (float)target.y, (float)target.z), (float)tau); + m_host.MoveToTarget(new Vector3((float)target.x, (float)target.y, (float)target.z), (float)tau); } public void llStopMoveToTarget() @@ -1652,7 +1651,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api if (force.z > 20000) force.z = 20000; - m_host.ApplyImpulse(new LLVector3((float)force.x, (float)force.y, (float)force.z), local != 0); + m_host.ApplyImpulse(new Vector3((float)force.x, (float)force.y, (float)force.z), local != 0); } public void llApplyRotationalImpulse(LSL_Types.Vector3 force, int local) @@ -1761,7 +1760,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { m_host.AddScriptLPS(1); - if (m_host.Sound != LLUUID.Zero) + if (m_host.Sound != UUID.Zero) llStopSound(); m_host.Sound = KeyOrName(sound); @@ -1803,7 +1802,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { m_host.AddScriptLPS(1); - m_host.Sound = LLUUID.Zero; + m_host.Sound = UUID.Zero; m_host.SoundGain = 0; m_host.SoundFlags = 0; m_host.SoundRadius = 0; @@ -1811,7 +1810,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api m_host.ScheduleFullUpdate(); m_host.SendFullUpdateToAllClients(); - // m_host.SendSound(LLUUID.Zero.ToString(), 1.0, false, 2); + // m_host.SendSound(UUID.Zero.ToString(), 1.0, false, 2); } public void llPreloadSound(string sound) @@ -2059,13 +2058,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public LSL_Types.LSLInteger llGiveMoney(string destination, int amount) { - LLUUID invItemID=InventorySelf(); - if (invItemID == LLUUID.Zero) + UUID invItemID=InventorySelf(); + if (invItemID == UUID.Zero) return 0; m_host.AddScriptLPS(1); - if (m_host.TaskInventory[invItemID].PermsGranter == LLUUID.Zero) + if (m_host.TaskInventory[invItemID].PermsGranter == UUID.Zero) return 0; if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_DEBIT) == 0) @@ -2074,9 +2073,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api return 0; } - LLUUID toID=new LLUUID(); + UUID toID=new UUID(); - if (!LLUUID.TryParse(destination, out toID)) + if (!UUID.TryParse(destination, out toID)) { LSLError("Bad key in llGiveMoney"); return 0; @@ -2140,7 +2139,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api // it's possible to have two items with the same task inventory name. // this is an easter egg of sorts. - foreach (KeyValuePair inv in m_host.TaskInventory) + foreach (KeyValuePair inv in m_host.TaskInventory) { if (inv.Value.Name == inventory) { @@ -2151,18 +2150,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api continue; } - LLVector3 llpos = new LLVector3((float)pos.x, (float)pos.y, (float)pos.z); + Vector3 llpos = new Vector3((float)pos.x, (float)pos.y, (float)pos.z); // test if we're further away then 10m if (Util.GetDistanceTo(llpos, m_host.AbsolutePosition) > 10) return; // wiki says, if it's further away then 10m, silently fail. - LLVector3 llvel = new LLVector3((float)vel.x, (float)vel.y, (float)vel.z); + Vector3 llvel = new Vector3((float)vel.x, (float)vel.y, (float)vel.z); // need the magnitude later float velmag = (float)Util.GetMagnitude(llvel); - SceneObjectGroup new_group = World.RezObject(m_host, inv.Value, llpos, new LLQuaternion((float)rot.x, (float)rot.y, (float)rot.z, (float)rot.s), llvel, param); + SceneObjectGroup new_group = World.RezObject(m_host, inv.Value, llpos, new Quaternion((float)rot.x, (float)rot.y, (float)rot.z, (float)rot.s), llvel, param); // If either of these are null, then there was an unknown error. if (new_group == null) @@ -2176,7 +2175,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams( "object_rez", new Object[] { new LSL_Types.LSLString( - new_group.RootPart.UUID.ToString()) }, + new_group.RootPart.ToString()) }, new DetectParams[0])); float groupmass = new_group.GetMass(); @@ -2243,7 +2242,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api return; } - if (m_host.TaskInventory[InventorySelf()].PermsGranter != LLUUID.Zero) + if (m_host.TaskInventory[InventorySelf()].PermsGranter != UUID.Zero) { ScenePresence presence = World.GetScenePresence(m_host.TaskInventory[InventorySelf()].PermsGranter); @@ -2270,7 +2269,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api return; } - if (m_host.TaskInventory[InventorySelf()].PermsGranter != LLUUID.Zero) + if (m_host.TaskInventory[InventorySelf()].PermsGranter != UUID.Zero) { ScenePresence presence = World.GetScenePresence(m_host.TaskInventory[InventorySelf()].PermsGranter); @@ -2331,14 +2330,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api // TODO: figure out values for client, fromSession, and imSessionID // client.SendInstantMessage(m_host.UUID, fromSession, message, user, imSessionID, m_host.Name, AgentManager.InstantMessageDialog.MessageFromAgent, (uint)Util.UnixTimeSinceEpoch()); - LLUUID friendTransactionID = LLUUID.Random(); + UUID friendTransactionID = UUID.Random(); //m_pendingFriendRequests.Add(friendTransactionID, fromAgentID); GridInstantMessage msg = new GridInstantMessage(); - msg.fromAgentID = new Guid(m_host.UUID.ToString()); // fromAgentID.UUID; + msg.fromAgentID = new Guid(m_host.ToString()); // fromAgentID.Guid; msg.fromAgentSession = new Guid(friendTransactionID.ToString());// fromAgentSession.UUID; - msg.toAgentID = new Guid(user); // toAgentID.UUID; + msg.toAgentID = new Guid(user); // toAgentID.Guid; msg.imSessionID = new Guid(friendTransactionID.ToString()); // This is the item we're mucking with here // Console.WriteLine("[Scripting IM]: From:" + msg.fromAgentID.ToString() + " To: " + msg.toAgentID.ToString() + " Session:" + msg.imSessionID.ToString() + " Message:" + message); // Console.WriteLine("[Scripting IM]: Filling Session: " + msg.imSessionID.ToString()); @@ -2356,8 +2355,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api msg.fromGroup = false;// fromGroup; msg.offline = (byte)0; //offline; msg.ParentEstateID = 0; //ParentEstateID; - msg.Position = new sLLVector3();// new sLLVector3(m_host.AbsolutePosition); - msg.RegionID = World.RegionInfo.RegionID.UUID;//RegionID.UUID; + msg.Position = Vector3.Zero;// new Vector3(m_host.AbsolutePosition); + msg.RegionID = World.RegionInfo.RegionID.Guid;//RegionID.Guid; msg.binaryBucket = new byte[0];// binaryBucket; World.TriggerGridInstantMessage(msg, InstantMessageReceiver.IMModule); // ScriptSleep(2000); @@ -2404,7 +2403,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public string llGetKey() { m_host.AddScriptLPS(1); - return m_host.UUID.ToString(); + return m_host.ToString(); } public void llSetBuoyancy(double buoyancy) @@ -2468,11 +2467,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { m_host.AddScriptLPS(1); - LLUUID invItemID=InventorySelf(); - if (invItemID == LLUUID.Zero) + UUID invItemID=InventorySelf(); + if (invItemID == UUID.Zero) return; - if (m_host.TaskInventory[invItemID].PermsGranter == LLUUID.Zero) + if (m_host.TaskInventory[invItemID].PermsGranter == UUID.Zero) return; if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_TRIGGER_ANIMATION) != 0) @@ -2481,9 +2480,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api if (presence != null) { - // Do NOT try to parse LLUUID, animations cannot be triggered by ID - LLUUID animID=InventoryKey(anim, (int)AssetType.Animation); - if (animID == LLUUID.Zero) + // Do NOT try to parse UUID, animations cannot be triggered by ID + UUID animID=InventoryKey(anim, (int)AssetType.Animation); + if (animID == UUID.Zero) presence.AddAnimation(anim); else presence.AddAnimation(animID); @@ -2495,30 +2494,30 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { m_host.AddScriptLPS(1); - LLUUID invItemID=InventorySelf(); - if (invItemID == LLUUID.Zero) + UUID invItemID=InventorySelf(); + if (invItemID == UUID.Zero) return; - if (m_host.TaskInventory[invItemID].PermsGranter == LLUUID.Zero) + if (m_host.TaskInventory[invItemID].PermsGranter == UUID.Zero) return; if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_TRIGGER_ANIMATION) != 0) { - LLUUID animID = new LLUUID(); + UUID animID = new UUID(); - if (!LLUUID.TryParse(anim, out animID)) + if (!UUID.TryParse(anim, out animID)) { animID=InventoryKey(anim); } - if (animID == LLUUID.Zero) + if (animID == UUID.Zero) return; ScenePresence presence = World.GetScenePresence(m_host.TaskInventory[invItemID].PermsGranter); if (presence != null) { - if (animID == LLUUID.Zero) + if (animID == UUID.Zero) presence.RemoveAnimation(anim); else presence.RemoveAnimation(animID); @@ -2541,8 +2540,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public void llTargetOmega(LSL_Types.Vector3 axis, double spinrate, double gain) { m_host.AddScriptLPS(1); - m_host.RotationalVelocity = new LLVector3((float)(axis.x * spinrate), (float)(axis.y * spinrate), (float)(axis.z * spinrate)); - m_host.AngularVelocity = new LLVector3((float)(axis.x * spinrate), (float)(axis.y * spinrate), (float)(axis.z * spinrate)); + m_host.RotationalVelocity = new Vector3((float)(axis.x * spinrate), (float)(axis.y * spinrate), (float)(axis.z * spinrate)); + m_host.AngularVelocity = new Vector3((float)(axis.x * spinrate), (float)(axis.y * spinrate), (float)(axis.z * spinrate)); m_host.ScheduleTerseUpdate(); m_host.SendTerseUpdateToAllClients(); } @@ -2561,19 +2560,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public void llRequestPermissions(string agent, int perm) { - LLUUID agentID=new LLUUID(); + UUID agentID=new UUID(); - if (!LLUUID.TryParse(agent, out agentID)) + if (!UUID.TryParse(agent, out agentID)) return; - LLUUID invItemID=InventorySelf(); + UUID invItemID=InventorySelf(); - if (invItemID == LLUUID.Zero) + if (invItemID == UUID.Zero) return; // Not in a prim? How?? - if (agentID == LLUUID.Zero || perm == 0) // Releasing permissions + if (agentID == UUID.Zero || perm == 0) // Releasing permissions { - m_host.TaskInventory[invItemID].PermsGranter=LLUUID.Zero; + m_host.TaskInventory[invItemID].PermsGranter=UUID.Zero; m_host.TaskInventory[invItemID].PermsMask=0; m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams( @@ -2655,14 +2654,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api new DetectParams[0])); } - void handleScriptAnswer(IClientAPI client, LLUUID taskID, LLUUID itemID, int answer) + void handleScriptAnswer(IClientAPI client, UUID taskID, UUID itemID, int answer) { if (taskID != m_host.UUID) return; - LLUUID invItemID=InventorySelf(); + UUID invItemID=InventorySelf(); - if (invItemID == LLUUID.Zero) + if (invItemID == UUID.Zero) return; client.OnScriptAnswer-=handleScriptAnswer; @@ -2687,7 +2686,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api } } - return LLUUID.Zero.ToString(); + return UUID.Zero.ToString(); } public LSL_Types.LSLInteger llGetPermissions() @@ -2725,8 +2724,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api SceneObjectPart part = m_host.ParentGroup.GetLinkNumPart(linknumber); if (linknumber > -1) { - LLObject.TextureEntry tex = part.Shape.Textures; - LLColor texcolor; + Primitive.TextureEntry tex = part.Shape.Textures; + Color4 texcolor; if (face > -1) { texcolor = tex.CreateFace((uint)face).RGBA; @@ -2772,8 +2771,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { linknumber = w; part = m_host.ParentGroup.GetLinkNumPart(linknumber); - LLObject.TextureEntry tex = part.Shape.Textures; - LLColor texcolor; + Primitive.TextureEntry tex = part.Shape.Textures; + Color4 texcolor; if (face > -1) { texcolor = tex.CreateFace((uint)face).RGBA; @@ -2816,7 +2815,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public void llCreateLink(string target, int parent) { m_host.AddScriptLPS(1); - LLUUID invItemID = InventorySelf(); + UUID invItemID = InventorySelf(); if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0) { ShoutError("Script trying to link but PERMISSION_CHANGE_LINKS permission not set!"); return; @@ -2841,7 +2840,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api childPrim.RootPart.UpdateFlag = uf; } parentPrim.TriggerScriptChangedEvent(Changed.LINK); - parentPrim.RootPart.AddFlag(LLObject.ObjectFlags.CreateSelected); + parentPrim.RootPart.AddFlag(PrimFlags.CreateSelected); parentPrim.GetProperties(client); ScriptSleep(1000); @@ -2865,11 +2864,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api SceneObjectPart part = m_host.ParentGroup.GetLinkNumPart(linknum); if (part != null) { - return part.UUID.ToString(); + return part.ToString(); } else { - return LLUUID.Zero.ToString(); + return UUID.Zero.ToString(); } } @@ -2891,7 +2890,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { m_host.AddScriptLPS(1); int count = 0; - foreach (KeyValuePair inv in m_host.TaskInventory) + foreach (KeyValuePair inv in m_host.TaskInventory) { if (inv.Value.Type == type || type == -1) { @@ -2905,7 +2904,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { m_host.AddScriptLPS(1); ArrayList keys = new ArrayList(); - foreach (KeyValuePair inv in m_host.TaskInventory) + foreach (KeyValuePair inv in m_host.TaskInventory) { if (inv.Value.Type == type || type == -1) { @@ -2926,14 +2925,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public void llSetScriptState(string name, int run) { - LLUUID item; + UUID item; m_host.AddScriptLPS(1); // These functions are supposed to be robust, // so get the state one step at a time. - if ((item = ScriptByName(name)) != LLUUID.Zero) + if ((item = ScriptByName(name)) != UUID.Zero) { m_ScriptEngine.SetScriptState(item, run == 0 ? false : true); } @@ -2954,17 +2953,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { m_host.AddScriptLPS(1); bool found = false; - LLUUID destId = LLUUID.Zero; - LLUUID objId = LLUUID.Zero; + UUID destId = UUID.Zero; + UUID objId = UUID.Zero; - if (!LLUUID.TryParse(destination, out destId)) + if (!UUID.TryParse(destination, out destId)) { llSay(0, "Could not parse key " + destination); return; } // move the first object found with this inventory name - foreach (KeyValuePair inv in m_host.TaskInventory) + foreach (KeyValuePair inv in m_host.TaskInventory) { if (inv.Value.Name == inventory) { @@ -3037,7 +3036,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api World.CommsManager.UserService.GetAgentByUUID(id); if (userProfile == null || userAgent == null) - return LLUUID.Zero.ToString(); + return UUID.Zero.ToString(); string reply = String.Empty; @@ -3065,12 +3064,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api reply = "0"; break; default: - return LLUUID.Zero.ToString(); // Raise no event + return UUID.Zero.ToString(); // Raise no event } - LLUUID rq = LLUUID.Random(); + UUID rq = UUID.Random(); - LLUUID tid = AsyncCommands. + UUID tid = AsyncCommands. DataserverPlugin.RegisterRequest(m_localID, m_itemID, rq.ToString()); @@ -3089,23 +3088,23 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { if (item.Type == 3 && item.Name == name) { - LLUUID tid = AsyncCommands. + UUID tid = AsyncCommands. DataserverPlugin.RegisterRequest(m_localID, m_itemID, item.AssetID.ToString()); - LLVector3 region = new LLVector3( + Vector3 region = new Vector3( World.RegionInfo.RegionLocX * Constants.RegionSize, World.RegionInfo.RegionLocY * Constants.RegionSize, 0); World.AssetCache.GetAsset(item.AssetID, - delegate(LLUUID i, AssetBase a) + delegate(UUID i, AssetBase a) { AssetLandmark lm = new AssetLandmark(a); float rx = (uint)(lm.RegionHandle >> 32); float ry = (uint)lm.RegionHandle; - region = lm.Position + new LLVector3(rx, ry, 0) - region; + region = lm.Position + new Vector3(rx, ry, 0) - region; string reply = region.ToString(); AsyncCommands. @@ -3130,8 +3129,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public void llTeleportAgentHome(string agent) { m_host.AddScriptLPS(1); - LLUUID agentId = new LLUUID(); - if (LLUUID.TryParse(agent, out agentId)) + UUID agentId = new UUID(); + if (UUID.TryParse(agent, out agentId)) { ScenePresence presence = World.GetScenePresence(agentId); if (presence != null) @@ -3147,7 +3146,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public void llModifyLand(int action, int brush) { m_host.AddScriptLPS(1); - World.ExternalChecks.ExternalChecksCanTerraformLand(m_host.OwnerID, new LLVector3(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y, 0)); + World.ExternalChecks.ExternalChecksCanTerraformLand(m_host.OwnerID, new Vector3(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y, 0)); } public void llCollisionSound(string impact_sound, double impact_volume) @@ -3182,7 +3181,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api m_host.AddScriptLPS(1); // uint partLocalID; - LLUUID partItemID; + UUID partItemID; switch ((int)linknum) { @@ -3357,7 +3356,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api SceneObjectPart targ = World.GetSceneObjectPart(target); if (targ == null) return; - targ.ApplyImpulse(new LLVector3((float)impulse.x, (float)impulse.y, (float)impulse.z), local != 0); + targ.ApplyImpulse(new Vector3((float)impulse.x, (float)impulse.y, (float)impulse.z), local != 0); } public void llPassCollisions(int pass) @@ -3636,7 +3635,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public string llGetInventoryKey(string name) { m_host.AddScriptLPS(1); - foreach (KeyValuePair inv in m_host.TaskInventory) + foreach (KeyValuePair inv in m_host.TaskInventory) { if (inv.Value.Name == name) { @@ -3646,11 +3645,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api } else { - return LLUUID.Zero.ToString(); + return UUID.Zero.ToString(); } } } - return LLUUID.Zero.ToString(); + return UUID.Zero.ToString(); } public void llAllowInventoryDrop(int add) @@ -3668,10 +3667,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api m_host.AddScriptLPS(1); LSL_Types.Vector3 SunDoubleVector3; - LLVector3 SunFloatVector3; + Vector3 SunFloatVector3; // sunPosition estate setting is set in OpenSim.Region.Environment.Modules.SunModule - // have to convert from LLVector3 (float) to LSL_Types.Vector3 (double) + // have to convert from Vector3 (float) to LSL_Types.Vector3 (double) SunFloatVector3 = World.RegionInfo.RegionSettings.SunVector; SunDoubleVector3.x = (double)SunFloatVector3.X; SunDoubleVector3.y = (double)SunFloatVector3.Y; @@ -3683,7 +3682,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public LSL_Types.Vector3 llGetTextureOffset(int face) { m_host.AddScriptLPS(1); - LLObject.TextureEntry tex = m_host.Shape.Textures; + Primitive.TextureEntry tex = m_host.Shape.Textures; LSL_Types.Vector3 offset; if (face == -1) { @@ -3698,7 +3697,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public LSL_Types.Vector3 llGetTextureScale(int side) { m_host.AddScriptLPS(1); - LLObject.TextureEntry tex = m_host.Shape.Textures; + Primitive.TextureEntry tex = m_host.Shape.Textures; LSL_Types.Vector3 scale; if (side == -1) { @@ -3713,7 +3712,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public double llGetTextureRot(int face) { m_host.AddScriptLPS(1); - LLObject.TextureEntry tex = m_host.Shape.Textures; + Primitive.TextureEntry tex = m_host.Shape.Textures; if (face == -1) { face = 0; @@ -3730,14 +3729,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public string llGetOwnerKey(string id) { m_host.AddScriptLPS(1); - LLUUID key = new LLUUID(); - if (LLUUID.TryParse(id, out key)) + UUID key = new UUID(); + if (UUID.TryParse(id, out key)) { return World.GetSceneObjectPart(World.Entities[key].LocalId).OwnerID.ToString(); } else { - return LLUUID.Zero.ToString(); + return UUID.Zero.ToString(); } } @@ -3946,8 +3945,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api return 2; if (src.Data[index] is String) { - LLUUID tuuid; - if (LLUUID.TryParse(src.Data[index].ToString(), out tuuid)) + UUID tuuid; + if (UUID.TryParse(src.Data[index].ToString(), out tuuid)) { return 3; } @@ -4359,8 +4358,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public string llKey2Name(string id) { m_host.AddScriptLPS(1); - LLUUID key = new LLUUID(); - if (LLUUID.TryParse(id,out key)) + UUID key = new UUID(); + if (UUID.TryParse(id,out key)) { ScenePresence presence = World.GetScenePresence(key); @@ -4384,7 +4383,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { m_host.AddScriptLPS(1); Primitive.TextureAnimation pTexAnim = new Primitive.TextureAnimation(); - pTexAnim.Flags =(uint) mode; + pTexAnim.Flags = (Primitive.TextureAnimMode)mode; //ALL_SIDES if (face == -1) @@ -4473,8 +4472,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public LSL_Types.LSLInteger llOverMyLand(string id) { m_host.AddScriptLPS(1); - LLUUID key = new LLUUID(); - if (LLUUID.TryParse(id,out key)) + UUID key = new UUID(); + if (UUID.TryParse(id,out key)) { ScenePresence presence = World.GetScenePresence(key); if (presence != null) // object is an avatar @@ -4517,8 +4516,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { m_host.AddScriptLPS(1); - LLUUID key = new LLUUID(); - if (LLUUID.TryParse(id, out key)) + UUID key = new UUID(); + if (UUID.TryParse(id, out key)) { ScenePresence av = World.GetScenePresence(key); @@ -4656,8 +4655,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api Primitive.ParticleSystem ps = new Primitive.ParticleSystem(); // TODO find out about the other defaults and add them here - ps.PartStartColor = new LLColor(1.0f, 1.0f, 1.0f, 1.0f); - ps.PartEndColor = new LLColor(1.0f, 1.0f, 1.0f, 1.0f); + ps.PartStartColor = new Color4(1.0f, 1.0f, 1.0f, 1.0f); + ps.PartEndColor = new Color4(1.0f, 1.0f, 1.0f, 1.0f); ps.PartStartScaleX = 1.0f; ps.PartStartScaleY = 1.0f; ps.PartEndScaleX = 1.0f; @@ -4705,7 +4704,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api case (int)ScriptBaseClass.PSYS_PART_END_COLOR: tempv = (LSL_Types.Vector3)rules.Data[i + 1]; - //prules.PartEndColor = new LLColor(tempv.x,tempv.y,tempv.z,1); + //prules.PartEndColor = new Color4(tempv.x,tempv.y,tempv.z,1); prules.PartEndColor.R = (float)tempv.x; prules.PartEndColor.G = (float)tempv.y; @@ -4784,8 +4783,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api break; case (int)ScriptBaseClass.PSYS_SRC_TARGET_KEY: - LLUUID key = LLUUID.Zero; - if (LLUUID.TryParse(rules.Data[i + 1].ToString(), out key)) + UUID key = UUID.Zero; + if (UUID.TryParse(rules.Data[i + 1].ToString(), out key)) { prules.Target = key; } @@ -4829,37 +4828,37 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api NotImplemented("llGroundRepel"); } - private LLUUID GetTaskInventoryItem(string name) + private UUID GetTaskInventoryItem(string name) { - foreach (KeyValuePair inv in m_host.TaskInventory) + foreach (KeyValuePair inv in m_host.TaskInventory) { if (inv.Value.Name == name) return inv.Key; } - return LLUUID.Zero; + return UUID.Zero; } public void llGiveInventoryList(string destination, string category, LSL_Types.list inventory) { m_host.AddScriptLPS(1); - LLUUID destID; - if (!LLUUID.TryParse(destination, out destID)) + UUID destID; + if (!UUID.TryParse(destination, out destID)) return; - List itemList = new List(); + List itemList = new List(); foreach (Object item in inventory.Data) { - LLUUID itemID; - if (LLUUID.TryParse(item.ToString(), out itemID)) + UUID itemID; + if (UUID.TryParse(item.ToString(), out itemID)) { itemList.Add(itemID); } else { itemID = GetTaskInventoryItem(item.ToString()); - if (itemID != LLUUID.Zero) + if (itemID != UUID.Zero) itemList.Add(itemID); } } @@ -4920,7 +4919,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api rot.z = 1; // ZERO_ROTATION = 0,0,0,1 m_host.SitTargetPosition = new Vector3((float)offset.x, (float)offset.y, (float)offset.z); - m_host.SitTargetOrientation = new Quaternion((float)rot.s, (float)rot.x, (float)rot.y, (float)rot.z); + m_host.SitTargetOrientation = new Quaternion((float)rot.x, (float)rot.y, (float)rot.z, (float)rot.s); } public string llAvatarOnSitTarget() @@ -4932,12 +4931,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public void llAddToLandPassList(string avatar, double hours) { m_host.AddScriptLPS(1); - LLUUID key; + UUID key; LandData land = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).landData; if (land.OwnerID == m_host.OwnerID) { ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry(); - if (LLUUID.TryParse(avatar, out key)) + if (UUID.TryParse(avatar, out key)) { entry.AgentID = key; entry.Flags = ParcelManager.AccessList.Access; @@ -4963,13 +4962,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public void llSetCameraEyeOffset(LSL_Types.Vector3 offset) { m_host.AddScriptLPS(1); - m_host.SetCameraEyeOffset(new LLVector3((float)offset.x, (float)offset.y, (float)offset.z)); + m_host.SetCameraEyeOffset(new Vector3((float)offset.x, (float)offset.y, (float)offset.z)); } public void llSetCameraAtOffset(LSL_Types.Vector3 offset) { m_host.AddScriptLPS(1); - m_host.SetCameraAtOffset(new LLVector3((float)offset.x, (float)offset.y, (float)offset.z)); + m_host.SetCameraAtOffset(new Vector3((float)offset.x, (float)offset.y, (float)offset.z)); } public string llDumpList2String(LSL_Types.list src, string seperator) @@ -4991,7 +4990,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public LSL_Types.LSLInteger llScriptDanger(LSL_Types.Vector3 pos) { m_host.AddScriptLPS(1); - bool result = World.scriptDanger(m_host.LocalId, new LLVector3((float)pos.x, (float)pos.y, (float)pos.z)); + bool result = World.scriptDanger(m_host.LocalId, new Vector3((float)pos.x, (float)pos.y, (float)pos.z)); if (result) { return 1; @@ -5006,8 +5005,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public void llDialog(string avatar, string message, LSL_Types.list buttons, int chat_channel) { m_host.AddScriptLPS(1); - LLUUID av = new LLUUID(); - if (!LLUUID.TryParse(avatar,out av)) + UUID av = new UUID(); + if (!UUID.TryParse(avatar,out av)) { LSLError("First parameter to llDialog needs to be a key"); return; @@ -5032,7 +5031,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api } buts[i] = buttons.Data[i].ToString(); } - World.SendDialogToUser(av, m_host.Name, m_host.UUID, m_host.OwnerID, message, new LLUUID("00000000-0000-2222-3333-100000001000"), chat_channel, buts); + World.SendDialogToUser(av, m_host.Name, m_host.UUID, m_host.OwnerID, message, new UUID("00000000-0000-2222-3333-100000001000"), chat_channel, buts); // ScriptSleep(1000); } @@ -5049,11 +5048,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public void llResetOtherScript(string name) { - LLUUID item; + UUID item; m_host.AddScriptLPS(1); - if ((item = ScriptByName(name)) != LLUUID.Zero) + if ((item = ScriptByName(name)) != UUID.Zero) m_ScriptEngine.ResetScript(item); else ShoutError("llResetOtherScript: script "+name+" not found"); @@ -5061,11 +5060,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public LSL_Types.LSLInteger llGetScriptState(string name) { - LLUUID item; + UUID item; m_host.AddScriptLPS(1); - if ((item = ScriptByName(name)) != LLUUID.Zero) + if ((item = ScriptByName(name)) != UUID.Zero) { return m_ScriptEngine.GetScriptState(item) ?1:0; } @@ -5095,10 +5094,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { m_host.AddScriptLPS(1); bool found = false; - LLUUID destId = LLUUID.Zero; - LLUUID srcId = LLUUID.Zero; + UUID destId = UUID.Zero; + UUID srcId = UUID.Zero; - if (!LLUUID.TryParse(target, out destId)) + if (!UUID.TryParse(target, out destId)) { llSay(0, "Could not parse key " + target); return; @@ -5111,7 +5110,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api } // copy the first script found with this inventory name - foreach (KeyValuePair inv in m_host.TaskInventory) + foreach (KeyValuePair inv in m_host.TaskInventory) { if (inv.Value.Name == name) { @@ -5143,8 +5142,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api IXMLRPC xmlrpcMod = m_ScriptEngine.World.RequestModuleInterface(); if (xmlrpcMod.IsEnabled()) { - LLUUID channelID = xmlrpcMod.OpenXMLRPCChannel(m_localID, m_itemID, LLUUID.Zero); - object[] resobj = new object[] { new LSL_Types.LSLInteger(1), new LSL_Types.LSLString(channelID.ToString()), new LSL_Types.LSLString(LLUUID.Zero.ToString()), new LSL_Types.LSLString(String.Empty), new LSL_Types.LSLInteger(0), new LSL_Types.LSLString(String.Empty) }; + UUID channelID = xmlrpcMod.OpenXMLRPCChannel(m_localID, m_itemID, UUID.Zero); + object[] resobj = new object[] { new LSL_Types.LSLInteger(1), new LSL_Types.LSLString(channelID.ToString()), new LSL_Types.LSLString(UUID.Zero.ToString()), new LSL_Types.LSLString(String.Empty), new LSL_Types.LSLInteger(0), new LSL_Types.LSLString(String.Empty) }; m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams( "remote_data", resobj, new DetectParams[0])); @@ -5464,9 +5463,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api private void SetPrimitiveShapeParams(SceneObjectPart part, string map, int type) { ObjectShapePacket.ObjectDataBlock shapeBlock = new ObjectShapePacket.ObjectDataBlock(); - LLUUID sculptId; + UUID sculptId; - if (!LLUUID.TryParse(map, out sculptId)) + if (!UUID.TryParse(map, out sculptId)) { llSay(0, "Could not parse key " + map); return; @@ -5896,9 +5895,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api ScenePresence av = World.GetScenePresence(id); if (av == null) return l; - LLUUID[] anims; + UUID[] anims; anims = av.GetAnimationArray(); - foreach (LLUUID foo in anims) + foreach (UUID foo in anims) l.Add(foo.ToString()); return l; } @@ -5906,8 +5905,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public void llSetParcelMusicURL(string url) { m_host.AddScriptLPS(1); - LLUUID landowner = World.GetLandOwner(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y); - if (landowner == LLUUID.Zero) + UUID landowner = World.GetLandOwner(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y); + if (landowner == UUID.Zero) { return; } @@ -5922,9 +5921,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public void osSetParcelMediaURL(string url) { m_host.AddScriptLPS(1); - LLUUID landowner = World.GetLandOwner(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y); + UUID landowner = World.GetLandOwner(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y); - if (landowner == LLUUID.Zero) + if (landowner == UUID.Zero) { return; } @@ -5978,8 +5977,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api SceneObjectPart part = m_host.ParentGroup.GetLinkNumPart(linknumber); if (linknumber > -1) { - LLObject.TextureEntry tex = part.Shape.Textures; - LLColor texcolor; + Primitive.TextureEntry tex = part.Shape.Textures; + Color4 texcolor; if (face > -1) { texcolor = tex.CreateFace((uint)face).RGBA; @@ -6017,8 +6016,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { linknumber = w; part = m_host.ParentGroup.GetLinkNumPart(linknumber); - LLObject.TextureEntry tex = part.Shape.Textures; - LLColor texcolor; + Primitive.TextureEntry tex = part.Shape.Textures; + Color4 texcolor; if (face > -1) { texcolor = tex.CreateFace((uint)face).RGBA; @@ -6086,21 +6085,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api break; case (int)ScriptBaseClass.PRIM_PHYSICS: - if ((m_host.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.Physics) != 0) + if ((m_host.GetEffectiveObjectFlags() & (uint)PrimFlags.Physics) != 0) res.Add(new LSL_Types.LSLInteger(1)); else res.Add(new LSL_Types.LSLInteger(0)); break; case (int)ScriptBaseClass.PRIM_TEMP_ON_REZ: - if ((m_host.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.TemporaryOnRez) != 0) + if ((m_host.GetEffectiveObjectFlags() & (uint)PrimFlags.TemporaryOnRez) != 0) res.Add(new LSL_Types.LSLInteger(1)); else res.Add(new LSL_Types.LSLInteger(0)); break; case (int)ScriptBaseClass.PRIM_PHANTOM: - if ((m_host.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.Phantom) != 0) + if ((m_host.GetEffectiveObjectFlags() & (uint)PrimFlags.Phantom) != 0) res.Add(new LSL_Types.LSLInteger(1)); else res.Add(new LSL_Types.LSLInteger(0)); @@ -6205,8 +6204,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api if (face == -1) face = 0; - LLObject.TextureEntry tex = m_host.Shape.Textures; - LLObject.TextureEntryFace texface = tex.GetFace((uint)face); + Primitive.TextureEntry tex = m_host.Shape.Textures; + Primitive.TextureEntryFace texface = tex.GetFace((uint)face); res.Add(new LSL_Types.LSLString(texface.TextureID.ToString())); res.Add(new LSL_Types.Vector3(texface.RepeatU, @@ -6225,7 +6224,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api face=Convert.ToInt32(rules.Data[idx++].ToString()); tex = m_host.Shape.Textures; - LLColor texcolor; + Color4 texcolor; if (face == -1) // TMP: Until we can determine number of sides, ALL_SIDES (-1) will return default color texcolor = tex.DefaultTexture.RGBA; else @@ -6579,7 +6578,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public void llSetLocalRot(LSL_Types.Quaternion rot) { m_host.AddScriptLPS(1); - m_host.RotationOffset = new LLQuaternion((float)rot.x, (float)rot.y, (float)rot.z, (float)rot.s); + m_host.RotationOffset = new Quaternion((float)rot.x, (float)rot.y, (float)rot.z, (float)rot.s); // ScriptSleep(200); } @@ -6835,7 +6834,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public LSL_Types.LSLInteger llGetInventoryPermMask(string item, int mask) { m_host.AddScriptLPS(1); - foreach (KeyValuePair inv in m_host.TaskInventory) + foreach (KeyValuePair inv in m_host.TaskInventory) { if (inv.Value.Name == item) { @@ -6866,7 +6865,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public string llGetInventoryCreator(string item) { m_host.AddScriptLPS(1); - foreach (KeyValuePair inv in m_host.TaskInventory) + foreach (KeyValuePair inv in m_host.TaskInventory) { if (inv.Value.Name == item) { @@ -6881,7 +6880,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { m_host.AddScriptLPS(1); - World.SimChatBroadcast(Helpers.StringToField(msg), ChatTypeEnum.Owner, 0, m_host.AbsolutePosition, m_host.Name, m_host.UUID, false); + World.SimChatBroadcast(Utils.StringToBytes(msg), ChatTypeEnum.Owner, 0, m_host.AbsolutePosition, m_host.Name, m_host.UUID, false); // IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface(); // wComm.DeliverMessage(ChatTypeEnum.Owner, 0, m_host.Name, m_host.UUID, msg); } @@ -6902,7 +6901,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api if (info == null) { // ScriptSleep(1000); - return LLUUID.Zero.ToString(); + return UUID.Zero.ToString(); } reply = new LSL_Types.Vector3( info.RegionLocX * Constants.RegionSize, @@ -6919,7 +6918,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api if (info == null) { // ScriptSleep(1000); - return LLUUID.Zero.ToString(); + return UUID.Zero.ToString(); } int access = info.RegionSettings.Maturity; if (access == 0) @@ -6934,11 +6933,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api break; default: // ScriptSleep(1000); - return LLUUID.Zero.ToString(); // Raise no event + return UUID.Zero.ToString(); // Raise no event } - LLUUID rq = LLUUID.Random(); + UUID rq = UUID.Random(); - LLUUID tid = AsyncCommands. + UUID tid = AsyncCommands. DataserverPlugin.RegisterRequest(m_localID, m_itemID, rq.ToString()); AsyncCommands. @@ -6950,7 +6949,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api catch(Exception e) { Console.WriteLine(e.ToString()); - return LLUUID.Zero.ToString(); + return UUID.Zero.ToString(); } } @@ -6963,8 +6962,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public double llGetObjectMass(string id) { m_host.AddScriptLPS(1); - LLUUID key = new LLUUID(); - if (LLUUID.TryParse(id,out key)) + UUID key = new UUID(); + if (UUID.TryParse(id,out key)) { return (double)World.GetSceneObjectPart(World.Entities[key].LocalId).GetMass(); } @@ -7056,7 +7055,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public void llLoadURL(string avatar_id, string message, string url) { m_host.AddScriptLPS(1); - LLUUID avatarId = new LLUUID(avatar_id); + UUID avatarId = new UUID(avatar_id); m_ScriptEngine.World.SendUrlToUser(avatarId, m_host.Name, m_host.UUID, m_host.ObjectOwner, false, message, url); // ScriptSleep(10000); @@ -7202,7 +7201,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public LSL_Types.LSLInteger llGetInventoryType(string name) { m_host.AddScriptLPS(1); - foreach (KeyValuePair inv in m_host.TaskInventory) + foreach (KeyValuePair inv in m_host.TaskInventory) { if (inv.Value.Name == name) { @@ -7231,10 +7230,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public LSL_Types.Vector3 llGetCameraPos() { m_host.AddScriptLPS(1); - LLUUID invItemID=InventorySelf(); - if (invItemID == LLUUID.Zero) + UUID invItemID=InventorySelf(); + if (invItemID == UUID.Zero) return new LSL_Types.Vector3(); - if (m_host.TaskInventory[invItemID].PermsGranter == LLUUID.Zero) + if (m_host.TaskInventory[invItemID].PermsGranter == UUID.Zero) return new LSL_Types.Vector3(); if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_TRACK_CAMERA) == 0) { @@ -7244,7 +7243,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api ScenePresence presence = World.GetScenePresence(m_host.OwnerID); if (presence != null) { - LSL_Types.Vector3 pos = new LSL_Types.Vector3(presence.CameraPosition.x,presence.CameraPosition.y,presence.CameraPosition.z); + LSL_Types.Vector3 pos = new LSL_Types.Vector3(presence.CameraPosition.X, presence.CameraPosition.Y, presence.CameraPosition.Z); return pos; } return new LSL_Types.Vector3(); @@ -7307,12 +7306,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public void llAddToLandBanList(string avatar, double hours) { m_host.AddScriptLPS(1); - LLUUID key; + UUID key; LandData land = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).landData; if (land.OwnerID == m_host.OwnerID) { ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry(); - if (LLUUID.TryParse(avatar, out key)) + if (UUID.TryParse(avatar, out key)) { entry.AgentID = key; entry.Flags = ParcelManager.AccessList.Ban; @@ -7326,11 +7325,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public void llRemoveFromLandPassList(string avatar) { m_host.AddScriptLPS(1); - LLUUID key; + UUID key; LandData land = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).landData; if (land.OwnerID == m_host.OwnerID) { - if (LLUUID.TryParse(avatar, out key)) + if (UUID.TryParse(avatar, out key)) { foreach (ParcelManager.ParcelAccessEntry entry in land.ParcelAccessList) { @@ -7348,11 +7347,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public void llRemoveFromLandBanList(string avatar) { m_host.AddScriptLPS(1); - LLUUID key; + UUID key; LandData land = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).landData; if (land.OwnerID == m_host.OwnerID) { - if (LLUUID.TryParse(avatar, out key)) + if (UUID.TryParse(avatar, out key)) { foreach (ParcelManager.ParcelAccessEntry entry in land.ParcelAccessList) { @@ -7372,16 +7371,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api m_host.AddScriptLPS(1); // our key in the object we are in - LLUUID invItemID=InventorySelf(); - if (invItemID == LLUUID.Zero) return; + UUID invItemID=InventorySelf(); + if (invItemID == UUID.Zero) return; // the object we are in - LLUUID objectID = m_host.ParentUUID; - if (objectID == LLUUID.Zero) return; + UUID objectID = m_host.ParentUUID; + if(objectID == UUID.Zero) return; // we need the permission first, to know which avatar we want to set the camera for - LLUUID agentID = m_host.TaskInventory[invItemID].PermsGranter; - if (agentID == LLUUID.Zero) return; + UUID agentID = m_host.TaskInventory[invItemID].PermsGranter; + if (agentID == UUID.Zero) return; if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CONTROL_CAMERA) == 0) return; ScenePresence presence = World.GetScenePresence(agentID); @@ -7423,16 +7422,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api m_host.AddScriptLPS(1); // our key in the object we are in - LLUUID invItemID=InventorySelf(); - if (invItemID == LLUUID.Zero) return; + UUID invItemID=InventorySelf(); + if (invItemID == UUID.Zero) return; // the object we are in - LLUUID objectID = m_host.ParentUUID; - if (objectID == LLUUID.Zero) return; + UUID objectID = m_host.ParentUUID; + if(objectID == UUID.Zero) return; // we need the permission first, to know which avatar we want to clear the camera for - LLUUID agentID = m_host.TaskInventory[invItemID].PermsGranter; - if (agentID == LLUUID.Zero) return; + UUID agentID = m_host.TaskInventory[invItemID].PermsGranter; + if (agentID == UUID.Zero) return; if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CONTROL_CAMERA) == 0) return; ScenePresence presence = World.GetScenePresence(agentID); @@ -7531,9 +7530,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api param.Add(o.ToString()); } - LLVector3 position = m_host.AbsolutePosition; - LLVector3 velocity = m_host.Velocity; - LLQuaternion rotation = m_host.RotationOffset; + Vector3 position = m_host.AbsolutePosition; + Vector3 velocity = m_host.Velocity; + Quaternion rotation = m_host.RotationOffset; ScenePresence scenePresence = World.GetScenePresence(m_host.ObjectOwner); RegionInfo regionInfo = World.RegionInfo; @@ -7549,10 +7548,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api httpHeaders["X-SecondLife-Owner-Name"] = scenePresence == null ? string.Empty : scenePresence.ControllingClient.Name; httpHeaders["X-SecondLife-Owner-Key"] = m_host.ObjectOwner.ToString(); - LLUUID reqID = httpScriptMod. + UUID reqID = httpScriptMod. StartHttpRequest(m_localID, m_itemID, url, param, httpHeaders, body); - if (reqID != LLUUID.Zero) + if (reqID != UUID.Zero) return reqID.ToString(); else return null; @@ -7662,7 +7661,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api LSL_Types.list ret = new LSL_Types.list(); if (land != null) { - foreach (KeyValuePair d in land.getLandObjectOwners()) + foreach (KeyValuePair d in land.getLandObjectOwners()) { ret.Add(d.Key.ToString()); ret.Add(d.Value); @@ -7675,7 +7674,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public LSL_Types.LSLInteger llGetObjectPrimCount(string object_id) { m_host.AddScriptLPS(1); - SceneObjectPart part = World.GetSceneObjectPart(new LLUUID(object_id)); + SceneObjectPart part = World.GetSceneObjectPart(new UUID(object_id)); if (part == null) { return 0; @@ -7781,8 +7780,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { m_host.AddScriptLPS(1); LSL_Types.list ret = new LSL_Types.list(); - LLUUID key = new LLUUID(); - if (LLUUID.TryParse(id, out key)) + UUID key = new UUID(); + if (UUID.TryParse(id, out key)) { ScenePresence av = World.GetScenePresence(key); @@ -7802,19 +7801,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api ret.Add(new LSL_Types.Vector3((double)av.AbsolutePosition.X, (double)av.AbsolutePosition.Y, (double)av.AbsolutePosition.Z)); break; case "4": - ret.Add(new LSL_Types.Quaternion((double)av.Rotation.x, (double)av.Rotation.y, (double)av.Rotation.z, (double)av.Rotation.w)); + ret.Add(new LSL_Types.Quaternion((double)av.Rotation.X, (double)av.Rotation.Y, (double)av.Rotation.Z, (double)av.Rotation.W)); break; case "5": - ret.Add(new LSL_Types.Vector3(av.Velocity.X,av.Velocity.Y,av.Velocity.Z)); + ret.Add(new LSL_Types.Vector3(av.Velocity.X, av.Velocity.Y, av.Velocity.Z)); break; case "6": ret.Add(id); break; case "7": - ret.Add(LLUUID.Zero.ToString()); + ret.Add(UUID.Zero.ToString()); break; case "8": - ret.Add(LLUUID.Zero.ToString()); + ret.Add(UUID.Zero.ToString()); break; } } @@ -7834,7 +7833,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api ret.Add(obj.Description); break; case "3": - ret.Add(new LSL_Types.Vector3(obj.AbsolutePosition.X,obj.AbsolutePosition.Y,obj.AbsolutePosition.Z)); + ret.Add(new LSL_Types.Vector3(obj.AbsolutePosition.X, obj.AbsolutePosition.Y, obj.AbsolutePosition.Z)); break; case "4": ret.Add(new LSL_Types.Quaternion(obj.RotationOffset.X, obj.RotationOffset.Y, obj.RotationOffset.Z, obj.RotationOffset.W)); @@ -7860,14 +7859,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api } - internal LLUUID ScriptByName(string name) + internal UUID ScriptByName(string name) { foreach (TaskInventoryItem item in m_host.TaskInventory.Values) { if (item.Type == 10 && item.Name == name) return item.ItemID; } - return LLUUID.Zero; + return UUID.Zero; } internal void ShoutError(string msg) @@ -7893,10 +7892,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api throw new Exception("LSL Runtime Error: " + msg); } - public delegate void AssetRequestCallback(LLUUID assetID, AssetBase asset); - private void WithNotecard(LLUUID assetID, AssetRequestCallback cb) + public delegate void AssetRequestCallback(UUID assetID, AssetBase asset); + private void WithNotecard(UUID assetID, AssetRequestCallback cb) { - World.AssetCache.GetAsset(assetID, delegate(LLUUID i, AssetBase a) { cb(i, a); }, false); + World.AssetCache.GetAsset(assetID, delegate(UUID i, AssetBase a) { cb(i, a); }, false); } public string llGetNumberOfNotecardLines(string name) @@ -7907,7 +7906,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { if (item.Type == 7 && item.Name == name) { - LLUUID tid = AsyncCommands. + UUID tid = AsyncCommands. DataserverPlugin.RegisterRequest(m_localID, m_itemID, item.AssetID.ToString()); if (NotecardCache.IsCached(item.AssetID)) @@ -7918,7 +7917,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api // ScriptSleep(100); return tid.ToString(); } - WithNotecard(item.AssetID, delegate (LLUUID id, AssetBase a) + WithNotecard(item.AssetID, delegate (UUID id, AssetBase a) { System.Text.ASCIIEncoding enc = new System.Text.ASCIIEncoding(); @@ -7934,7 +7933,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api } } // ScriptSleep(100); - return LLUUID.Zero.ToString(); + return UUID.Zero.ToString(); } public string llGetNotecardLine(string name, int line) @@ -7945,7 +7944,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { if (item.Type == 7 && item.Name == name) { - LLUUID tid = AsyncCommands. + UUID tid = AsyncCommands. DataserverPlugin.RegisterRequest(m_localID, m_itemID, item.AssetID.ToString()); if (NotecardCache.IsCached(item.AssetID)) @@ -7956,7 +7955,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api // ScriptSleep(100); return tid.ToString(); } - WithNotecard(item.AssetID, delegate (LLUUID id, AssetBase a) + WithNotecard(item.AssetID, delegate (UUID id, AssetBase a) { System.Text.ASCIIEncoding enc = new System.Text.ASCIIEncoding(); @@ -7987,10 +7986,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public DateTime lastRef; } - private static Dictionary m_Notecards = - new Dictionary(); + private static Dictionary m_Notecards = + new Dictionary(); - public static void Cache(LLUUID assetID, string text) + public static void Cache(UUID assetID, string text) { CacheCheck(); @@ -8081,7 +8080,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api return output.ToArray(); } - public static bool IsCached(LLUUID assetID) + public static bool IsCached(UUID assetID) { lock (m_Notecards) { @@ -8089,7 +8088,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api } } - public static int GetLines(LLUUID assetID) + public static int GetLines(UUID assetID) { if (!IsCached(assetID)) return -1; @@ -8101,7 +8100,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api } } - public static string GetLine(LLUUID assetID, int line) + public static string GetLine(UUID assetID, int line) { if (line < 0) return ""; @@ -8128,7 +8127,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public static void CacheCheck() { - foreach (LLUUID key in new List(m_Notecards.Keys)) + foreach (UUID key in new List(m_Notecards.Keys)) { Notecard nc = m_Notecards[key]; if (nc.lastRef.AddSeconds(30) < DateTime.Now) diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 257b17b..0f598ea 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs @@ -26,8 +26,7 @@ */ using System; using System.Runtime.Remoting.Lifetime; -using Axiom.Math; -using libsecondlife; +using OpenMetaverse; using Nini.Config; using OpenSim.Framework.Console; using OpenSim.Region.Environment.Interfaces; @@ -46,9 +45,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api internal IScriptEngine m_ScriptEngine; internal SceneObjectPart m_host; internal uint m_localID; - internal LLUUID m_itemID; + internal UUID m_itemID; - public void Initialize(IScriptEngine ScriptEngine, SceneObjectPart host, uint localID, LLUUID itemID) + public void Initialize(IScriptEngine ScriptEngine, SceneObjectPart host, uint localID, UUID itemID) { m_ScriptEngine = ScriptEngine; m_host = host; @@ -86,7 +85,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api if (x > 255 || x < 0 || y > 255 || y < 0) OSSLError("osTerrainSetHeight: Coordinate out of bounds"); - if (World.ExternalChecks.ExternalChecksCanTerraformLand(m_host.OwnerID, new LLVector3(x, y, 0))) + if (World.ExternalChecks.ExternalChecksCanTerraformLand(m_host.OwnerID, new Vector3(x, y, 0))) { World.Heightmap[x, y] = val; return 1; @@ -144,7 +143,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api World.SendGeneralAlert(msg); } - public void osSetRot(LLUUID target, Quaternion rotation) + public void osSetRot(UUID target, Quaternion rotation) { if (!m_ScriptEngine.Config.GetBoolean("AllowOSFunctions", false)) { @@ -176,7 +175,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api if (dynamicID == String.Empty) { IDynamicTextureManager textureManager = World.RequestModuleInterface(); - LLUUID createdTexture = + UUID createdTexture = textureManager.AddDynamicTextureURL(World.RegionInfo.RegionID, m_host.UUID, contentType, url, extraParams, timer); return createdTexture.ToString(); @@ -186,7 +185,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api //TODO update existing dynamic textures } - return LLUUID.Zero.ToString(); + return UUID.Zero.ToString(); } public string osSetDynamicTextureURLBlend(string dynamicID, string contentType, string url, string extraParams, @@ -202,7 +201,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api if (dynamicID == String.Empty) { IDynamicTextureManager textureManager = World.RequestModuleInterface(); - LLUUID createdTexture = + UUID createdTexture = textureManager.AddDynamicTextureURL(World.RegionInfo.RegionID, m_host.UUID, contentType, url, extraParams, timer, true, (byte) alpha); return createdTexture.ToString(); @@ -212,7 +211,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api //TODO update existing dynamic textures } - return LLUUID.Zero.ToString(); + return UUID.Zero.ToString(); } public string osSetDynamicTextureData(string dynamicID, string contentType, string data, string extraParams, @@ -230,7 +229,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api IDynamicTextureManager textureManager = World.RequestModuleInterface(); if (textureManager != null) { - LLUUID createdTexture = + UUID createdTexture = textureManager.AddDynamicTextureData(World.RegionInfo.RegionID, m_host.UUID, contentType, data, extraParams, timer); return createdTexture.ToString(); @@ -241,7 +240,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api //TODO update existing dynamic textures } - return LLUUID.Zero.ToString(); + return UUID.Zero.ToString(); } public string osSetDynamicTextureDataBlend(string dynamicID, string contentType, string data, string extraParams, @@ -259,7 +258,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api IDynamicTextureManager textureManager = World.RequestModuleInterface(); if (textureManager != null) { - LLUUID createdTexture = + UUID createdTexture = textureManager.AddDynamicTextureData(World.RegionInfo.RegionID, m_host.UUID, contentType, data, extraParams, timer, true, (byte) alpha); return createdTexture.ToString(); @@ -270,7 +269,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api //TODO update existing dynamic textures } - return LLUUID.Zero.ToString(); + return UUID.Zero.ToString(); } public bool osConsoleCommand(string command) @@ -539,9 +538,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api } m_host.AddScriptLPS(1); - LLUUID landowner = World.GetLandOwner(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y); + UUID landowner = World.GetLandOwner(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y); - if (landowner == LLUUID.Zero) + if (landowner == UUID.Zero) { return; } diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Dataserver.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Dataserver.cs index 52d277e..7300f10 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Dataserver.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Dataserver.cs @@ -28,7 +28,7 @@ using System; using System.Collections; using System.Collections.Generic; -using libsecondlife; +using OpenMetaverse; using OpenSim.Region.ScriptEngine.Shared; using OpenSim.Region.ScriptEngine.Shared.Api; @@ -49,28 +49,28 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins private class DataserverRequest { public uint localID; - public LLUUID itemID; + public UUID itemID; - public LLUUID ID; + public UUID ID; public string handle; public DateTime startTime; } - public LLUUID RegisterRequest(uint localID, LLUUID itemID, + public UUID RegisterRequest(uint localID, UUID itemID, string identifier) { lock (DataserverRequests) { if (DataserverRequests.ContainsKey(identifier)) - return LLUUID.Zero; + return UUID.Zero; DataserverRequest ds = new DataserverRequest(); ds.localID = localID; ds.itemID = itemID; - ds.ID = LLUUID.Random(); + ds.ID = UUID.Random(); ds.handle = identifier; ds.startTime = DateTime.Now; @@ -101,7 +101,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins new DetectParams[0])); } - public void RemoveEvents(uint localID, LLUUID itemID) + public void RemoveEvents(uint localID, UUID itemID) { lock (DataserverRequests) { diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Listener.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Listener.cs index 11b45b1..b353cba 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Listener.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Listener.cs @@ -26,7 +26,7 @@ */ using System; -using libsecondlife; +using OpenMetaverse; using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Environment.Modules.Scripting.WorldComm; using OpenSim.Region.ScriptEngine.Shared; @@ -74,14 +74,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins } } - public Object[] GetSerializationData(LLUUID itemID) + public Object[] GetSerializationData(UUID itemID) { IWorldComm comms = m_CmdManager.m_ScriptEngine.World.RequestModuleInterface(); return comms.GetSerializationData(itemID); } - public void CreateFromData(uint localID, LLUUID itemID, LLUUID hostID, + public void CreateFromData(uint localID, UUID itemID, UUID hostID, Object[] data) { IWorldComm comms = m_CmdManager.m_ScriptEngine.World.RequestModuleInterface(); diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs index eaf4bd0..d1e3921 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs @@ -27,7 +27,7 @@ using System; using System.Collections.Generic; -using libsecondlife; +using OpenMetaverse; using OpenSim.Framework; using OpenSim.Framework.Communications.Cache; using OpenSim.Region.Environment.Scenes; @@ -45,8 +45,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins m_CmdManager = CmdManager; } - public Dictionary> SenseEvents = - new Dictionary>(); + public Dictionary> SenseEvents = + new Dictionary>(); private Object SenseLock = new Object(); // @@ -55,12 +55,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins private class SenseRepeatClass { public uint localID; - public LLUUID itemID; + public UUID itemID; public double interval; public DateTime next; public string name; - public LLUUID keyID; + public UUID keyID; public int type; public double range; public double arc; @@ -70,8 +70,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins private List SenseRepeaters = new List(); private object SenseRepeatListLock = new object(); - public void SetSenseRepeatEvent(uint m_localID, LLUUID m_itemID, - string name, LLUUID keyID, int type, double range, + public void SetSenseRepeatEvent(uint m_localID, UUID m_itemID, + string name, UUID keyID, int type, double range, double arc, double sec, SceneObjectPart host) { // Always remove first, in case this is a re-set @@ -98,7 +98,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins } } - public void UnSetSenseRepeaterEvents(uint m_localID, LLUUID m_itemID) + public void UnSetSenseRepeaterEvents(uint m_localID, UUID m_itemID) { // Remove from timer lock (SenseRepeatListLock) @@ -138,8 +138,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins } // lock } - public void SenseOnce(uint m_localID, LLUUID m_itemID, - string name, LLUUID keyID, int type, + public void SenseOnce(uint m_localID, UUID m_itemID, + string name, UUID keyID, int type, double range, double arc, SceneObjectPart host) { // Add to timer @@ -156,11 +156,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins SensorSweep(ts); } - public LSL_Types.list GetSensorList(uint m_localID, LLUUID m_itemID) + public LSL_Types.list GetSensorList(uint m_localID, UUID m_itemID) { lock (SenseLock) { - Dictionary Obj = null; + Dictionary Obj = null; if (!SenseEvents.TryGetValue(m_localID, out Obj)) { return null; @@ -187,11 +187,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins return; } - LLVector3 sensorPos = SensePoint.AbsolutePosition; - LLVector3 regionPos = new LLVector3(m_CmdManager.m_ScriptEngine.World.RegionInfo.RegionLocX * Constants.RegionSize, m_CmdManager.m_ScriptEngine.World.RegionInfo.RegionLocY * Constants.RegionSize, 0); - LLVector3 fromRegionPos = sensorPos + regionPos; + Vector3 sensorPos = SensePoint.AbsolutePosition; + Vector3 regionPos = new Vector3(m_CmdManager.m_ScriptEngine.World.RegionInfo.RegionLocX * Constants.RegionSize, m_CmdManager.m_ScriptEngine.World.RegionInfo.RegionLocY * Constants.RegionSize, 0); + Vector3 fromRegionPos = sensorPos + regionPos; - LLQuaternion q = SensePoint.RotationOffset; + Quaternion q = SensePoint.RotationOffset; LSL_Types.Quaternion r = new LSL_Types.Quaternion(q.X, q.Y, q.Z, q.W); LSL_Types.Vector3 forward_dir = (new LSL_Types.Vector3(1, 0, 0) * r); double mag_fwd = LSL_Types.Vector3.Mag(forward_dir); @@ -203,7 +203,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins foreach (EntityBase ent in m_CmdManager.m_ScriptEngine.World.Entities.Values) { - LLVector3 toRegionPos = ent.AbsolutePosition + regionPos; + Vector3 toRegionPos = ent.AbsolutePosition + regionPos; double dis = Math.Abs((double)Util.GetDistanceTo(toRegionPos, fromRegionPos)); if (dis <= ts.range) { @@ -239,7 +239,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins double ang_obj = 0; try { - LLVector3 diff = toRegionPos - fromRegionPos; + Vector3 diff = toRegionPos - fromRegionPos; LSL_Types.Vector3 obj_dir = new LSL_Types.Vector3(diff.X, diff.Y, diff.Z); double dot = LSL_Types.Vector3.Dot(forward_dir, obj_dir); double mag_obj = LSL_Types.Vector3.Mag(obj_dir); @@ -252,7 +252,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins if (ang_obj > ts.arc) keep = false; } - if (keep && (ts.keyID != LLUUID.Zero) && (ts.keyID != ent.UUID)) + if (keep && (ts.keyID != UUID.Zero) && (ts.keyID != ent.UUID)) { keep = false; } @@ -292,10 +292,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins // Create object if it doesn't exist if (SenseEvents.ContainsKey(ts.localID) == false) { - SenseEvents.Add(ts.localID, new Dictionary()); + SenseEvents.Add(ts.localID, new Dictionary()); } // clear if previous traces exist - Dictionary Obj; + Dictionary Obj; SenseEvents.TryGetValue(ts.localID, out Obj); if (Obj.ContainsKey(ts.itemID) == true) Obj.Remove(ts.itemID); @@ -320,7 +320,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins for (idx = 0; idx < SensedObjects.Length; idx++) { detect[idx] = new DetectParams(); - detect[idx].Key=(LLUUID)(SensedObjects.Data[idx]); + detect[idx].Key=(UUID)(SensedObjects.Data[idx]); detect[idx].Populate(m_CmdManager.m_ScriptEngine.World); } @@ -333,7 +333,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins } } - public Object[] GetSerializationData(LLUUID itemID) + public Object[] GetSerializationData(UUID itemID) { List data = new List(); @@ -352,7 +352,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins return data.ToArray(); } - public void CreateFromData(uint localID, LLUUID itemID, LLUUID objectID, + public void CreateFromData(uint localID, UUID itemID, UUID objectID, Object[] data) { SceneObjectPart part = @@ -373,7 +373,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins ts.interval = (double)data[idx]; ts.name = (string)data[idx+1]; - ts.keyID = (LLUUID)data[idx+2]; + ts.keyID = (UUID)data[idx+2]; ts.type = (int)data[idx+3]; ts.range = (double)data[idx+4]; ts.arc = (double)data[idx+5]; diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs index 36e992b..ec7cd35 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs @@ -28,7 +28,7 @@ using System; using System.Collections; using System.Collections.Generic; -using libsecondlife; +using OpenMetaverse; using OpenSim.Region.ScriptEngine.Shared.Api; namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins @@ -48,7 +48,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins private class TimerClass { public uint localID; - public LLUUID itemID; + public UUID itemID; //public double interval; public long interval; //public DateTime next; @@ -58,7 +58,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins private List Timers = new List(); private object TimerListLock = new object(); - public void SetTimerEvent(uint m_localID, LLUUID m_itemID, double sec) + public void SetTimerEvent(uint m_localID, UUID m_itemID, double sec) { // Always remove first, in case this is a re-set UnSetTimerEvents(m_localID, m_itemID); @@ -81,7 +81,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins } } - public void UnSetTimerEvents(uint m_localID, LLUUID m_itemID) + public void UnSetTimerEvents(uint m_localID, UUID m_itemID) { // Remove from timer lock (TimerListLock) @@ -122,7 +122,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins } } - public Object[] GetSerializationData(LLUUID itemID) + public Object[] GetSerializationData(UUID itemID) { List data = new List(); @@ -140,7 +140,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins return data.ToArray(); } - public void CreateFromData(uint localID, LLUUID itemID, LLUUID objectID, + public void CreateFromData(uint localID, UUID itemID, UUID objectID, Object[] data) { int idx = 0; diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/LSL2CSConverter.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/LSL2CSConverter.cs index 45f92e3..57efb2e 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/LSL2CSConverter.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/LSL2CSConverter.cs @@ -118,7 +118,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools //System.Console.WriteLine("SCRIPT:" + checkscript); // checks for alpha.alpha way of referring to objects in C# - // ignores alpha.x alpha.y, alpha.z for refering to vector components + // ignores alpha.X alpha.Y, alpha.Z for refering to vector components Match SecurityM; // BROKEN: this check is very wrong. It block's any url in strings. diff --git a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs index d3222e7..8599e06 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs @@ -31,7 +31,7 @@ using System.Threading; using System.Collections; using System.Collections.Generic; using System.Runtime.Serialization; -using libsecondlife; +using OpenMetaverse; using OpenSim.Framework; using OpenSim.Region.Environment; using OpenSim.Region.Environment.Scenes; @@ -70,24 +70,24 @@ namespace OpenSim.Region.ScriptEngine.Shared { public DetectParams() { - Key = LLUUID.Zero; + Key = UUID.Zero; OffsetPos = new LSL_Types.Vector3(); LinkNum = 0; - Group = LLUUID.Zero; + Group = UUID.Zero; Name = String.Empty; - Owner = LLUUID.Zero; + Owner = UUID.Zero; Position = new LSL_Types.Vector3(); Rotation = new LSL_Types.Quaternion(); Type = 0; Velocity = new LSL_Types.Vector3(); } - public LLUUID Key; + public UUID Key; public LSL_Types.Vector3 OffsetPos; public int LinkNum; - public LLUUID Group; + public UUID Group; public string Name; - public LLUUID Owner; + public UUID Owner; public LSL_Types.Vector3 Position; public LSL_Types.Quaternion Rotation; public int Type; @@ -109,17 +109,17 @@ namespace OpenSim.Region.ScriptEngine.Shared presence.AbsolutePosition.Y, presence.AbsolutePosition.Z); Rotation = new LSL_Types.Quaternion( - presence.Rotation.x, - presence.Rotation.y, - presence.Rotation.z, - presence.Rotation.w); + presence.Rotation.X, + presence.Rotation.Y, + presence.Rotation.Z, + presence.Rotation.W); Velocity = new LSL_Types.Vector3( presence.Velocity.X, presence.Velocity.Y, presence.Velocity.Z); Type = 0x01; // Avatar - if (presence.Velocity != LLVector3.Zero) + if (presence.Velocity != Vector3.Zero) Type |= 0x02; // Active Group = presence.ControllingClient.ActiveGroupId; @@ -134,7 +134,7 @@ namespace OpenSim.Region.ScriptEngine.Shared Group = part.GroupID; Name = part.Name; Owner = part.OwnerID; - if (part.Velocity == LLVector3.Zero) + if (part.Velocity == Vector3.Zero) Type = 0x04; // Passive else Type = 0x02; // Passive @@ -152,7 +152,7 @@ namespace OpenSim.Region.ScriptEngine.Shared part.AbsolutePosition.Y, part.AbsolutePosition.Z); - LLQuaternion wr = part.GetWorldRotation(); + Quaternion wr = part.GetWorldRotation(); Rotation = new LSL_Types.Quaternion(wr.X, wr.Y, wr.Z, wr.W); Velocity = new LSL_Types.Vector3(part.Velocity.X, diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index e3dd9e9..d35bfa8 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs @@ -34,7 +34,7 @@ using System.Security.Policy; using System.Reflection; using System.Globalization; using System.Xml; -using libsecondlife; +using OpenMetaverse; using log4net; using Nini.Config; using Amib.Threading; @@ -56,12 +56,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance private IScriptWorkItem m_CurrentResult=null; private Queue m_EventQueue = new Queue(32); private bool m_RunEvents = false; - private LLUUID m_ItemID; + private UUID m_ItemID; private uint m_LocalID; - private LLUUID m_ObjectID; - private LLUUID m_AssetID; + private UUID m_ObjectID; + private UUID m_AssetID; private IScript m_Script; - private LLUUID m_AppDomain; + private UUID m_AppDomain; private DetectParams[] m_DetectParams; private bool m_TimerQueued; private DateTime m_EventStart; @@ -98,7 +98,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance get { return m_Engine; } } - public LLUUID AppDomain + public UUID AppDomain { get { return m_AppDomain; } set { m_AppDomain = value; } @@ -114,12 +114,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance get { return m_ScriptName; } } - public LLUUID ItemID + public UUID ItemID { get { return m_ItemID; } } - public LLUUID ObjectID + public UUID ObjectID { get { return m_ObjectID; } } @@ -129,7 +129,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance get { return m_LocalID; } } - public LLUUID AssetID + public UUID AssetID { get { return m_AssetID; } } @@ -152,7 +152,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance } public ScriptInstance(IScriptEngine engine, uint localID, - LLUUID objectID, LLUUID itemID, LLUUID assetID, string assembly, + UUID objectID, UUID itemID, UUID assetID, string assembly, AppDomain dom, string primName, string scriptName, int startParam, bool postOnRez, StateSource stateSource, int maxScriptQueue) @@ -520,7 +520,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance string text = "Runtime error:\n" + e.InnerException.ToString(); if (text.Length > 1000) text = text.Substring(0, 1000); - m_Engine.World.SimChat(Helpers.StringToField(text), + m_Engine.World.SimChat(Utils.StringToBytes(text), ChatTypeEnum.DebugChannel, 2147483647, part.AbsolutePosition, part.Name, part.UUID, false); @@ -581,7 +581,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance Stop(0); SceneObjectPart part=m_Engine.World.GetSceneObjectPart(m_LocalID); part.GetInventoryItem(m_ItemID).PermsMask = 0; - part.GetInventoryItem(m_ItemID).PermsGranter = LLUUID.Zero; + part.GetInventoryItem(m_ItemID).PermsGranter = UUID.Zero; AsyncCommandManager async = (AsyncCommandManager)m_Engine.AsyncCommands; async.RemoveScript(m_LocalID, m_ItemID); m_EventQueue.Clear(); @@ -602,7 +602,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance m_Script.ResetVars(); SceneObjectPart part=m_Engine.World.GetSceneObjectPart(m_LocalID); part.GetInventoryItem(m_ItemID).PermsMask = 0; - part.GetInventoryItem(m_ItemID).PermsGranter = LLUUID.Zero; + part.GetInventoryItem(m_ItemID).PermsGranter = UUID.Zero; AsyncCommandManager async = (AsyncCommandManager)m_Engine.AsyncCommands; async.RemoveScript(m_LocalID, m_ItemID); if (m_CurrentEvent != "state_entry") @@ -630,10 +630,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance return m_DetectParams[idx]; } - public LLUUID GetDetectID(int idx) + public UUID GetDetectID(int idx) { if (idx < 0 || idx >= m_DetectParams.Length) - return LLUUID.Zero; + return UUID.Zero; return m_DetectParams[idx].Key; } diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs index ba003c5..bc9b174 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs @@ -34,7 +34,7 @@ using System.Security.Policy; using System.Reflection; using System.Globalization; using System.Xml; -using libsecondlife; +using OpenMetaverse; using log4net; using Nini.Config; using Amib.Threading; @@ -264,9 +264,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance new LSL_Types.Vector3(vect); int d_linkNum=0; - LLUUID d_group = LLUUID.Zero; + UUID d_group = UUID.Zero; string d_name = String.Empty; - LLUUID d_owner = LLUUID.Zero; + UUID d_owner = UUID.Zero; LSL_Types.Vector3 d_position = new LSL_Types.Vector3(); LSL_Types.Quaternion d_rotation = @@ -285,14 +285,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance tmp = det.Attributes.GetNamedItem( "group").Value; - LLUUID.TryParse(tmp, out d_group); + UUID.TryParse(tmp, out d_group); d_name = det.Attributes.GetNamedItem( "name").Value; tmp = det.Attributes.GetNamedItem( "owner").Value; - LLUUID.TryParse(tmp, out d_owner); + UUID.TryParse(tmp, out d_owner); tmp = det.Attributes.GetNamedItem( "position").Value; @@ -318,8 +318,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance { } - LLUUID uuid = new LLUUID(); - LLUUID.TryParse(det.InnerText, + UUID uuid = new UUID(); + UUID.TryParse(det.InnerText, out uuid); DetectParams d = new DetectParams(); @@ -427,10 +427,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance if (itemType == "list") return ReadList(tag); - if (itemType == "libsecondlife.LLUUID") + if (itemType == "libsecondlife.UUID") { - LLUUID val = new LLUUID(); - LLUUID.TryParse(tag.InnerText, out val); + UUID val = new UUID(); + UUID.TryParse(tag.InnerText, out val); return val; } diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs index 4713283..3820dae 100644 --- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs +++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs @@ -123,7 +123,7 @@ namespace OpenSim.Region.ScriptEngine.Shared Vector3 vector = (Vector3)o; - return (x == vector.x && x == vector.x && z == vector.z); + return (x == vector.x && y == vector.y && z == vector.z); } public static Vector3 operator -(Vector3 vector) diff --git a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs index d431286..22abd79 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs @@ -28,7 +28,7 @@ using System; using System.Collections; using System.Collections.Generic; -using libsecondlife; +using OpenMetaverse; using OpenSim.Framework; using OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney; using OpenSim.Region.Interfaces; @@ -36,7 +36,6 @@ using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.ScriptEngine.Shared; using OpenSim.Region.ScriptEngine.Interfaces; -using Axiom.Math; namespace OpenSim.Region.ScriptEngine.XEngine { @@ -68,7 +67,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine } } - private void HandleObjectPaid(LLUUID objectID, LLUUID agentID, + private void HandleObjectPaid(UUID objectID, UUID agentID, int amount) { SceneObjectPart part = @@ -80,7 +79,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine } } - public void touch_start(uint localID, uint originalID, LLVector3 offsetPos, + public void touch_start(uint localID, uint originalID, Vector3 offsetPos, IClientAPI remoteClient) { // Add to queue for all scripts in ObjectID object @@ -108,7 +107,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine det)); } - public void touch(uint localID, uint originalID, LLVector3 offsetPos, + public void touch(uint localID, uint originalID, Vector3 offsetPos, IClientAPI remoteClient) { // Add to queue for all scripts in ObjectID object @@ -177,7 +176,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine // state_entry: not processed here // state_exit: not processed here - public void money(uint localID, LLUUID agentID, int amount) + public void money(uint localID, UUID agentID, int amount) { myScriptEngine.PostObjectEvent(localID, new EventParams( "money", new object[] { @@ -242,7 +241,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine det.ToArray())); } - public void land_collision_start(uint localID, LLUUID itemID) + public void land_collision_start(uint localID, UUID itemID) { myScriptEngine.PostObjectEvent(localID, new EventParams( "land_collision_start", @@ -250,7 +249,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine new DetectParams[0])); } - public void land_collision(uint localID, LLUUID itemID) + public void land_collision(uint localID, UUID itemID) { myScriptEngine.PostObjectEvent(localID, new EventParams( "land_collision", @@ -258,7 +257,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine new DetectParams[0])); } - public void land_collision_end(uint localID, LLUUID itemID) + public void land_collision_end(uint localID, UUID itemID) { myScriptEngine.PostObjectEvent(localID, new EventParams( "land_collision_end", @@ -269,7 +268,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine // timer: not handled here // listen: not handled here - public void control(uint localID, LLUUID itemID, LLUUID agentID, uint held, uint change) + public void control(uint localID, UUID itemID, UUID agentID, uint held, uint change) { myScriptEngine.PostObjectEvent(localID, new EventParams( "control",new object[] { @@ -279,7 +278,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine new DetectParams[0])); } - public void email(uint localID, LLUUID itemID, string timeSent, + public void email(uint localID, UUID itemID, string timeSent, string address, string subject, string message, int numLeft) { myScriptEngine.PostObjectEvent(localID, new EventParams( @@ -292,8 +291,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine new DetectParams[0])); } - public void at_target(uint localID, uint handle, LLVector3 targetpos, - LLVector3 atpos) + public void at_target(uint localID, uint handle, Vector3 targetpos, + Vector3 atpos) { myScriptEngine.PostObjectEvent(localID, new EventParams( "at_target", new object[] { @@ -310,14 +309,14 @@ namespace OpenSim.Region.ScriptEngine.XEngine new DetectParams[0])); } - public void at_rot_target(uint localID, LLUUID itemID) + public void at_rot_target(uint localID, UUID itemID) { myScriptEngine.PostObjectEvent(localID, new EventParams( "at_rot_target",new object[0], new DetectParams[0])); } - public void not_at_rot_target(uint localID, LLUUID itemID) + public void not_at_rot_target(uint localID, UUID itemID) { myScriptEngine.PostObjectEvent(localID, new EventParams( "not_at_rot_target",new object[0], @@ -326,7 +325,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine // run_time_permissions: not handled here - public void attach(uint localID, LLUUID itemID, LLUUID avatar) + public void attach(uint localID, UUID itemID, UUID avatar) { myScriptEngine.PostObjectEvent(localID, new EventParams( "attach",new object[] { @@ -337,14 +336,14 @@ namespace OpenSim.Region.ScriptEngine.XEngine // dataserver: not handled here // link_message: not handled here - public void moving_start(uint localID, LLUUID itemID) + public void moving_start(uint localID, UUID itemID) { myScriptEngine.PostObjectEvent(localID, new EventParams( "moving_start",new object[0], new DetectParams[0])); } - public void moving_end(uint localID, LLUUID itemID) + public void moving_end(uint localID, UUID itemID) { myScriptEngine.PostObjectEvent(localID, new EventParams( "moving_end",new object[0], diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index 8ad8110..485531d 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs @@ -34,7 +34,7 @@ using System.Security.Policy; using System.Reflection; using System.Globalization; using System.Xml; -using libsecondlife; +using OpenMetaverse; using log4net; using Nini.Config; using Amib.Threading; @@ -76,28 +76,28 @@ namespace OpenSim.Region.ScriptEngine.XEngine // Maps the local id to the script inventory items in it - private Dictionary > m_PrimObjects = - new Dictionary >(); + private Dictionary > m_PrimObjects = + new Dictionary >(); - // Maps the LLUUID above to the script instance + // Maps the UUID above to the script instance - private Dictionary m_Scripts = - new Dictionary(); + private Dictionary m_Scripts = + new Dictionary(); // Maps the asset ID to the assembly - private Dictionary m_Assemblies = - new Dictionary(); + private Dictionary m_Assemblies = + new Dictionary(); // This will list AppDomains by script asset - private Dictionary m_AppDomains = - new Dictionary(); + private Dictionary m_AppDomains = + new Dictionary(); // List the scripts running in each appdomain - private Dictionary > m_DomainScripts = - new Dictionary >(); + private Dictionary > m_DomainScripts = + new Dictionary >(); private Queue m_CompileQueue = new Queue(100); IWorkItemResult m_CurrentCompile = null; @@ -125,7 +125,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine // private struct RezScriptParms // { // uint LocalID; - // LLUUID ItemID; + // UUID ItemID; // string Script; // } @@ -314,7 +314,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine get { return false; } } - public void OnRezScript(uint localID, LLUUID itemID, string script, int startParam, bool postOnRez) + public void OnRezScript(uint localID, UUID itemID, string script, int startParam, bool postOnRez) { Object[] parms = new Object[]{localID, itemID, script, startParam, postOnRez}; @@ -395,7 +395,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine { Object[] p = (Object[])parm; uint localID = (uint)p[0]; - LLUUID itemID = (LLUUID)p[1]; + UUID itemID = (UUID)p[1]; string script =(string)p[2]; int startParam = (int)p[3]; bool postOnRez = (bool)p[4]; @@ -411,7 +411,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine if (item == null) return false; - LLUUID assetID = item.AssetID; + UUID assetID = item.AssetID; // m_log.DebugFormat("[XEngine] Compiling script {0} ({1})", // item.Name, itemID.ToString()); @@ -430,7 +430,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine string text = "Error compiling script:\r\n" + e.Message.ToString(); if (text.Length > 1000) text = text.Substring(0, 1000); - World.SimChat(Helpers.StringToField(text), + World.SimChat(Utils.StringToBytes(text), ChatTypeEnum.DebugChannel, 2147483647, part.AbsolutePosition, part.Name, part.UUID, false); @@ -455,7 +455,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine if ((!m_Scripts.ContainsKey(itemID)) || (m_Scripts[itemID].AssetID != assetID)) { - LLUUID appDomain = assetID; + UUID appDomain = assetID; if (part.ParentGroup.RootPart.IsAttachment) appDomain = part.ParentGroup.RootPart.UUID; @@ -480,7 +480,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine m_AppDomains[appDomain].AssemblyResolve += new ResolveEventHandler( AssemblyResolver.OnAssemblyResolve); - m_DomainScripts[appDomain] = new List(); + m_DomainScripts[appDomain] = new List(); } catch (Exception e) { @@ -507,7 +507,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine } if (!m_PrimObjects.ContainsKey(localID)) - m_PrimObjects[localID] = new List(); + m_PrimObjects[localID] = new List(); if (!m_PrimObjects[localID].Contains(itemID)) m_PrimObjects[localID].Add(itemID); @@ -518,7 +518,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine return true; } - public void OnRemoveScript(uint localID, LLUUID itemID) + public void OnRemoveScript(uint localID, UUID itemID) { lock (m_Scripts) { @@ -569,24 +569,24 @@ namespace OpenSim.Region.ScriptEngine.XEngine } } - public void OnScriptReset(uint localID, LLUUID itemID) + public void OnScriptReset(uint localID, UUID itemID) { ResetScript(itemID); } - public void OnStartScript(uint localID, LLUUID itemID) + public void OnStartScript(uint localID, UUID itemID) { StartScript(itemID); } - public void OnStopScript(uint localID, LLUUID itemID) + public void OnStopScript(uint localID, UUID itemID) { StopScript(itemID); } private void CleanAssemblies() { - List assetIDList = new List(m_Assemblies.Keys); + List assetIDList = new List(m_Assemblies.Keys); foreach (IScriptInstance i in m_Scripts.Values) { @@ -594,7 +594,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine assetIDList.Remove(i.AssetID); } - foreach (LLUUID assetID in assetIDList) + foreach (UUID assetID in assetIDList) { // m_log.DebugFormat("[XEngine] Removing unreferenced assembly {0}", m_Assemblies[assetID]); try @@ -615,7 +615,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine } } - private void UnloadAppDomain(LLUUID id) + private void UnloadAppDomain(UUID id) { if (m_AppDomains.ContainsKey(id)) { @@ -681,7 +681,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine if (!m_PrimObjects.ContainsKey(localID)) return false; - foreach (LLUUID itemID in m_PrimObjects[localID]) + foreach (UUID itemID in m_PrimObjects[localID]) { if (m_Scripts.ContainsKey(itemID)) { @@ -699,7 +699,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine // // Post an event to a single script // - public bool PostScriptEvent(LLUUID itemID, EventParams p) + public bool PostScriptEvent(UUID itemID, EventParams p) { if (m_Scripts.ContainsKey(itemID)) { @@ -737,7 +737,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine return null; } - private IScriptInstance GetInstance(LLUUID itemID) + private IScriptInstance GetInstance(UUID itemID) { IScriptInstance instance; lock (m_Scripts) @@ -749,7 +749,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine return instance; } - public void SetScriptState(LLUUID itemID, bool running) + public void SetScriptState(UUID itemID, bool running) { IScriptInstance instance = GetInstance(itemID); if (instance != null) @@ -761,7 +761,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine } } - public bool GetScriptState(LLUUID itemID) + public bool GetScriptState(UUID itemID) { IScriptInstance instance = GetInstance(itemID); if (instance != null) @@ -769,35 +769,35 @@ namespace OpenSim.Region.ScriptEngine.XEngine return false; } - public void ApiResetScript(LLUUID itemID) + public void ApiResetScript(UUID itemID) { IScriptInstance instance = GetInstance(itemID); if (instance != null) instance.ApiResetScript(); } - public void ResetScript(LLUUID itemID) + public void ResetScript(UUID itemID) { IScriptInstance instance = GetInstance(itemID); if (instance != null) instance.ResetScript(); } - public void StartScript(LLUUID itemID) + public void StartScript(UUID itemID) { IScriptInstance instance = GetInstance(itemID); if (instance != null) instance.Start(); } - public void StopScript(LLUUID itemID) + public void StopScript(UUID itemID) { IScriptInstance instance = GetInstance(itemID); if (instance != null) instance.Stop(0); } - public DetectParams GetDetectParams(LLUUID itemID, int idx) + public DetectParams GetDetectParams(UUID itemID, int idx) { IScriptInstance instance = GetInstance(itemID); if (instance != null) @@ -805,22 +805,22 @@ namespace OpenSim.Region.ScriptEngine.XEngine return null; } - public LLUUID GetDetectID(LLUUID itemID, int idx) + public UUID GetDetectID(UUID itemID, int idx) { IScriptInstance instance = GetInstance(itemID); if (instance != null) return instance.GetDetectID(idx); - return LLUUID.Zero; + return UUID.Zero; } - public void SetState(LLUUID itemID, string newState) + public void SetState(UUID itemID, string newState) { IScriptInstance instance = GetInstance(itemID); if (instance == null) return; instance.SetState(newState); } - public string GetState(LLUUID itemID) + public string GetState(UUID itemID) { IScriptInstance instance = GetInstance(itemID); if (instance == null) @@ -828,7 +828,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine return instance.State; } - public int GetStartParameter(LLUUID itemID) + public int GetStartParameter(UUID itemID) { IScriptInstance instance = GetInstance(itemID); if (instance == null) @@ -836,7 +836,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine return instance.StartParam; } - public bool GetScriptRunning(LLUUID objectID, LLUUID itemID) + public bool GetScriptRunning(UUID objectID, UUID itemID) { return GetScriptState(itemID); } -- cgit v1.1