From 65c5efe43b68700bad94076d4cd421160203c5de Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Fri, 16 May 2008 01:22:11 +0000 Subject: Formatting cleanup. --- .../Common/BuiltIn_Commands_BaseClass.cs | 6 +- OpenSim/Region/ScriptEngine/Common/ExecutorBase.cs | 2 +- .../ScriptEngine/Common/LSL_BuiltIn_Commands.cs | 290 ++++++++++----------- OpenSim/Region/ScriptEngine/Common/LSL_Types.cs | 22 +- .../ScriptEngine/Common/OSSL_BuilIn_Commands.cs | 4 +- .../Common/OSSL_BuilIn_Commands_Interface.cs | 2 +- .../ScriptEngine/Common/Properties/AssemblyInfo.cs | 8 +- .../Common/ScriptEngineBase/AsyncCommandManager.cs | 4 +- .../AsyncCommandPlugins/SensorRepeat.cs | 2 +- .../ScriptEngineBase/AsyncCommandPlugins/Timer.cs | 2 +- .../Common/ScriptEngineBase/MaintenanceThread.cs | 4 +- .../Common/ScriptEngineBase/ScriptEngine.cs | 4 +- .../Common/ScriptEngineBase/ScriptManager.cs | 6 +- .../Region/ScriptEngine/Common/TRPC/TCPServer.cs | 2 +- OpenSim/Region/ScriptEngine/Common/TRPC_Remote.cs | 2 +- .../DotNetEngine/Compiler/LSL/Compiler.cs | 12 +- .../DotNetEngine/Compiler/LSL/LSL2CSConverter.cs | 27 +- .../DotNetEngine/Properties/AssemblyInfo.cs | 10 +- .../ScriptEngine/DotNetEngine/ScriptManager.cs | 2 +- .../Region/ScriptEngine/LSOEngine/LSO/Engine.cs | 10 +- .../LSOEngine/LSO/LSL_BaseClass_OPCODES.cs | 4 +- .../ScriptEngine/LSOEngine/LSO/LSO_Parser.cs | 28 +- .../LSOEngine/Properties/AssemblyInfo.cs | 10 +- .../Region/ScriptEngine/LSOEngine/ScriptManager.cs | 2 +- .../RemoteServer/Properties/AssemblyInfo.cs | 10 +- .../ScriptEngine/RemoteServer/ScriptEngine.cs | 2 +- 26 files changed, 218 insertions(+), 259 deletions(-) (limited to 'OpenSim/Region/ScriptEngine') diff --git a/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs b/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs index afc3ff2..2c33b57 100644 --- a/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs +++ b/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs @@ -108,7 +108,7 @@ namespace OpenSim.Region.ScriptEngine.Common public void state(string state) { State = state; - + } public void Start(BuilIn_Commands LSL_Functions) @@ -125,9 +125,9 @@ namespace OpenSim.Region.ScriptEngine.Common ads.ConfigurationFile ); - // Display the name of the calling AppDomain and the name + // Display the name of the calling AppDomain and the name // of the second domain. - // NOTE: The application's thread has transitioned between + // NOTE: The application's thread has transitioned between // AppDomains. Console.WriteLine("Calling to '{0}'.", Thread.GetDomain().FriendlyName diff --git a/OpenSim/Region/ScriptEngine/Common/ExecutorBase.cs b/OpenSim/Region/ScriptEngine/Common/ExecutorBase.cs index 2e35b46..2887f1e 100644 --- a/OpenSim/Region/ScriptEngine/Common/ExecutorBase.cs +++ b/OpenSim/Region/ScriptEngine/Common/ExecutorBase.cs @@ -42,7 +42,7 @@ namespace OpenSim.Region.ScriptEngine.Common /// protected bool m_Running = true; /// - /// True indicates that the ScriptManager has stopped + /// True indicates that the ScriptManager has stopped /// this script. This prevents a script that has been /// stopped as part of deactivation from being /// resumed by a pending llSetScriptState request. diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs index d73a47a..ab91424 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs @@ -57,7 +57,7 @@ namespace OpenSim.Region.ScriptEngine.Common internal uint m_localID; internal LLUUID m_itemID; internal bool throwErrorOnNotImplemented = true; - + public LSL_BuiltIn_Commands(ScriptEngineBase.ScriptEngine ScriptEngine, SceneObjectPart host, uint localID, LLUUID itemID) { m_ScriptEngine = ScriptEngine; @@ -93,7 +93,7 @@ namespace OpenSim.Region.ScriptEngine.Common try { int eventFlags = m_ScriptEngine.m_ScriptManager.GetStateEventFlags(m_localID, m_itemID); - m_host.SetScriptEvents(m_itemID, eventFlags); + m_host.SetScriptEvents(m_itemID, eventFlags); m_ScriptEngine.m_EventManager.state_entry(m_localID); } catch (AppDomainUnloadedException) @@ -186,7 +186,7 @@ namespace OpenSim.Region.ScriptEngine.Common World.EventManager.TriggerRequestChangeWaterHeight((float)height); } } - + //These are the implementations of the various ll-functions used by the LSL scripts. //starting out, we use the System.Math library for trig functions. - ckrinke 8-14-07 public double llSin(double f) @@ -331,9 +331,9 @@ namespace OpenSim.Region.ScriptEngine.Common // New and improved, now actually works as described. Prim rotates as expected as does llRot2Euler. /* From wiki: - The Euler angle vector (in radians) is converted to a rotation by doing the rotations around the 3 axes - in Z, Y, X order. So llEuler2Rot(<1.0, 2.0, 3.0> * DEG_TO_RAD) generates a rotation by taking the zero rotation, - a vector pointing along the X axis, first rotating it 3 degrees around the global Z axis, then rotating the resulting + The Euler angle vector (in radians) is converted to a rotation by doing the rotations around the 3 axes + in Z, Y, X order. So llEuler2Rot(<1.0, 2.0, 3.0> * DEG_TO_RAD) generates a rotation by taking the zero rotation, + a vector pointing along the X axis, first rotating it 3 degrees around the global Z axis, then rotating the resulting vector 2 degrees around the global Y axis, and finally rotating that 1 degree around the global X axis. */ @@ -349,24 +349,24 @@ namespace OpenSim.Region.ScriptEngine.Common double sinX = Math.Sin(v.x); double sinY = Math.Sin(v.y); double sinZ = Math.Sin(v.z); - - s = Math.Sqrt( cosY * cosZ - sinX * sinY * sinZ + cosX * cosZ + cosX * cosY + 1.0f) * 0.5f; + + s = Math.Sqrt(cosY * cosZ - sinX * sinY * sinZ + cosX * cosZ + cosX * cosY + 1.0f) * 0.5f; if (Math.Abs(s) < 0.00001) // null rotation { - x = 0.0f; + x = 0.0f; y = 1.0f; - z = 0.0f; + z = 0.0f; } else { - s_i = 1.0f / (4.0f * s); - x = - ( -sinX * cosY - cosX * sinY * sinZ - sinX * cosZ) * s_i; - y = - ( -cosX * sinY * cosZ + sinX * sinZ - sinY) * s_i; - z = - ( -cosY * sinZ - sinX * sinY * cosZ - cosX * sinZ) * s_i; + s_i = 1.0f / (4.0f * s); + x = - (-sinX * cosY - cosX * sinY * sinZ - sinX * cosZ) * s_i; + y = - (-cosX * sinY * cosZ + sinX * sinZ - sinY) * s_i; + z = - (-cosY * sinZ - sinX * sinY * cosZ - cosX * sinZ) * s_i; } return new LSL_Types.Quaternion(x, y, z, s); } - + public LSL_Types.Quaternion llAxes2Rot(LSL_Types.Vector3 fwd, LSL_Types.Vector3 left, LSL_Types.Vector3 up) { @@ -477,7 +477,7 @@ namespace OpenSim.Region.ScriptEngine.Common m_host.AddScriptLPS(1); LLUUID keyID = LLUUID.Zero; LLUUID.TryParse(id, out keyID); - + m_ScriptEngine.m_ASYNCLSLCommandManager.m_SensorRepeat.SenseOnce(m_localID, m_itemID, name, keyID, type, range, arc, m_host); } @@ -625,7 +625,7 @@ namespace OpenSim.Region.ScriptEngine.Common return String.Empty; - + } public LSL_Types.LSLInteger llDetectedType(int number) @@ -644,7 +644,7 @@ namespace OpenSim.Region.ScriptEngine.Common mask |= 0x04; // passive non-moving else mask |= 0x02; // active moving - if (SensedObject is IScript) mask |= 0x08; // Scripted. It COULD have one hidden ... + if (SensedObject is IScript) mask |= 0x08; // Scripted. It COULD have one hidden ... return mask; } @@ -655,7 +655,7 @@ 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); } @@ -757,7 +757,7 @@ namespace OpenSim.Region.ScriptEngine.Common if ((status & BuiltIn_Commands_BaseClass.STATUS_ROTATE_X) == BuiltIn_Commands_BaseClass.STATUS_ROTATE_X) { statusrotationaxis |= BuiltIn_Commands_BaseClass.STATUS_ROTATE_X; - + } if ((status & BuiltIn_Commands_BaseClass.STATUS_ROTATE_Y) == BuiltIn_Commands_BaseClass.STATUS_ROTATE_Y) { @@ -824,9 +824,9 @@ namespace OpenSim.Region.ScriptEngine.Common if (m_host.GetDieAtEdge()) return 1; - else + else return 0; - + case BuiltIn_Commands_BaseClass.STATUS_RETURN_AT_EDGE: NotImplemented("llGetStatus - STATUS_RETURN_AT_EDGE"); return 0; @@ -1248,7 +1248,7 @@ namespace OpenSim.Region.ScriptEngine.Common { m_host.AddScriptLPS(1); return m_host.registerTargetWaypoint(new LLVector3((float)position.x, (float)position.y, (float)position.z), (float)range); - + } public void llTargetRemove(int number) @@ -1286,21 +1286,21 @@ namespace OpenSim.Region.ScriptEngine.Common { m_host.AddScriptLPS(1); //No energy force yet - + if (force.x > 20000) force.x = 20000; if (force.y > 20000) force.y = 20000; if (force.z > 20000) force.z = 20000; - + if (local == 1) { m_host.ApplyImpulse(new LLVector3((float)force.x, (float)force.y, (float)force.z), true); } else { - + m_host.ApplyImpulse(new LLVector3((float)force.x,(float)force.y,(float)force.z), false); } } @@ -1475,7 +1475,7 @@ namespace OpenSim.Region.ScriptEngine.Common } // If end is positive, then it directly // corresponds to the lengt of the substring - // needed (plus one of course). BUT, it + // needed (plus one of course). BUT, it // must be within bounds. if (end >= src.Length) { @@ -1493,15 +1493,15 @@ namespace OpenSim.Region.ScriptEngine.Common // Inverted substring (end < start) else { - // Implies both indices are below the - // lower bound. In the inverted case, that + // Implies both indices are below the + // lower bound. In the inverted case, that // means the entire string will be returned // unchanged. if (start < 0) { return src; } - // If both indices are greater than the upper + // If both indices are greater than the upper // bound the result may seem initially counter // intuitive. if (end >= src.Length) @@ -1536,7 +1536,7 @@ namespace OpenSim.Region.ScriptEngine.Common /// /// Delete substring removes the specified substring bounded - /// by the inclusive indices start and end. Indices may be + /// by the inclusive indices start and end. Indices may be /// negative (indicating end-relative) and may be inverted, /// i.e. end < start. /// @@ -1591,7 +1591,7 @@ namespace OpenSim.Region.ScriptEngine.Common { return String.Empty; } - + if (end > 0) { if (start < src.Length) @@ -1616,7 +1616,7 @@ namespace OpenSim.Region.ScriptEngine.Common } } } - + /// /// Insert string inserts the specified string identified by src /// at the index indicated by index. Index may be negative, in @@ -1655,13 +1655,13 @@ namespace OpenSim.Region.ScriptEngine.Common // The index is in bounds. // In this case the index refers to the index that will - // be assigned to the first character of the inserted string. + // be assigned to the first character of the inserted string. // So unlike the other string operations, we do not add one // to get the correct string length. return dest.Substring(0,index)+src+dest.Substring(index); } - + public string llToUpper(string src) { m_host.AddScriptLPS(1); @@ -1767,12 +1767,12 @@ namespace OpenSim.Region.ScriptEngine.Common 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); - + // need the magnitude later float velmag = (float)Util.GetMagnitude(llvel); - + SceneObjectGroup new_group = World.RezObject(inv.Value, llpos, new LLQuaternion((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) continue; @@ -1844,7 +1844,7 @@ namespace OpenSim.Region.ScriptEngine.Common if (m_host.TaskInventory[InventorySelf()].PermsGranter != LLUUID.Zero) { ScenePresence presence = World.GetScenePresence(m_host.TaskInventory[InventorySelf()].PermsGranter); - + if (presence != null) { if ((m_host.TaskInventory[InventorySelf()].PermsMask & BuiltIn_Commands_BaseClass.PERMISSION_TAKE_CONTROLS) != 0) @@ -1871,7 +1871,7 @@ namespace OpenSim.Region.ScriptEngine.Common if (m_host.TaskInventory[InventorySelf()].PermsGranter != LLUUID.Zero) { ScenePresence presence = World.GetScenePresence(m_host.TaskInventory[InventorySelf()].PermsGranter); - + if (presence != null) { if ((m_host.TaskInventory[InventorySelf()].PermsMask & BuiltIn_Commands_BaseClass.PERMISSION_TAKE_CONTROLS) != 0) @@ -1924,7 +1924,7 @@ namespace OpenSim.Region.ScriptEngine.Common // InstantMessageModule.OnInstantMessage searches through a list of scenes for a client matching the toAgent, // but I don't think we have a list of scenes available from here. // (We also don't want to duplicate the code in OnInstantMessage if we can avoid it.) - + // user is a UUID // TODO: figure out values for client, fromSession, and imSessionID @@ -1991,7 +1991,7 @@ namespace OpenSim.Region.ScriptEngine.Common } } - + public void llSetHoverHeight(double height, int water, double tau) { @@ -2050,7 +2050,7 @@ namespace OpenSim.Region.ScriptEngine.Common if ((m_host.TaskInventory[invItemID].PermsMask & BuiltIn_Commands_BaseClass.PERMISSION_TRIGGER_ANIMATION) != 0) { ScenePresence presence = World.GetScenePresence(m_host.TaskInventory[invItemID].PermsGranter); - + if (presence != null) { // Do NOT try to parse LLUUID, animations cannot be triggered by ID @@ -2087,7 +2087,7 @@ namespace OpenSim.Region.ScriptEngine.Common return; ScenePresence presence = World.GetScenePresence(m_host.TaskInventory[invItemID].PermsGranter); - + if (presence != null) { if (animID == LLUUID.Zero) @@ -2194,7 +2194,7 @@ namespace OpenSim.Region.ScriptEngine.Common } ScenePresence presence = World.GetScenePresence(agentID); - + if (presence != null) { string ownerName=resolveName(m_host.ParentGroup.RootPart.OwnerID); @@ -2467,7 +2467,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 ((sm = m_ScriptEngine.m_ScriptManager) != null) @@ -2480,14 +2480,14 @@ namespace OpenSim.Region.ScriptEngine.Common } } } - } + } // Required by SL if (script == null) ShoutError("llSetScriptState: script "+name+" not found"); - // If we didn't find it, then it's safe to + // If we didn't find it, then it's safe to // assume it is not running. } @@ -2806,23 +2806,23 @@ namespace OpenSim.Region.ScriptEngine.Common /* The new / changed functions were tested with the following LSL script: - + default { state_entry() { rotation rot = llEuler2Rot(<0,70,0> * DEG_TO_RAD); - + llOwnerSay("to get here, we rotate over: "+ (string) llRot2Axis(rot)); llOwnerSay("and we rotate for: "+ (llRot2Angle(rot) * RAD_TO_DEG)); - + // convert back and forth between quaternion <-> vector and angle - + rotation newrot = llAxisAngle2Rot(llRot2Axis(rot),llRot2Angle(rot)); - + llOwnerSay("Old rotation was: "+(string) rot); llOwnerSay("re-converted rotation is: "+(string) newrot); - + llSetRot(rot); // to check the parameters in the prim } } @@ -2832,7 +2832,7 @@ namespace OpenSim.Region.ScriptEngine.Common // Xantor 29/apr/2008 // Returns rotation described by rotating angle radians about axis. - // q = cos(a/2) + i ( x * sin(a/2)) + j (y * sin(a/2)) + k ( z * sin(a/2)) + // q = cos(a/2) + i (x * sin(a/2)) + j (y * sin(a/2)) + k (z * sin(a/2)) public LSL_Types.Quaternion llAxisAngle2Rot(LSL_Types.Vector3 axis, double angle) { m_host.AddScriptLPS(1); @@ -2849,7 +2849,7 @@ namespace OpenSim.Region.ScriptEngine.Common // NotImplemented("llAxisAngle2Rot"); } - + // Xantor 29/apr/2008 // converts a Quaternion to X,Y,Z axis rotations public LSL_Types.Vector3 llRot2Axis(LSL_Types.Quaternion rot) @@ -3264,7 +3264,7 @@ namespace OpenSim.Region.ScriptEngine.Common /// /// The supplied string is scanned for commas /// and converted into a list. Commas are only - /// effective if they are encountered outside + /// effective if they are encountered outside /// of '<' '>' delimiters. Any whitespace /// before or after an element is trimmed. /// @@ -3314,7 +3314,7 @@ namespace OpenSim.Region.ScriptEngine.Common } /// - /// Randomizes the list, be arbitrarily reordering + /// Randomizes the list, be arbitrarily reordering /// sublists of stride elements. As the stride approaches /// the size of the list, the options become very /// limited. @@ -3323,7 +3323,7 @@ namespace OpenSim.Region.ScriptEngine.Common /// This could take a while for very large list /// sizes. /// - + public LSL_Types.list llListRandomize(LSL_Types.list src, int stride) { @@ -3344,7 +3344,7 @@ namespace OpenSim.Region.ScriptEngine.Common // Stride MUST be a factor of the list length // If not, then return the src list. This also // traps those cases where stride > length. - + if (src.Length != stride && src.Length%stride == 0) { chunkk = src.Length/stride; @@ -3384,7 +3384,7 @@ namespace OpenSim.Region.ScriptEngine.Common object[] array = new object[src.Length]; Array.Copy(src.Data, 0, array, 0, src.Length); result = new LSL_Types.list(array); - } + } return result; @@ -3394,10 +3394,10 @@ namespace OpenSim.Region.ScriptEngine.Common /// Elements in the source list starting with 0 and then /// every i+stride. If the stride is negative then the scan /// is backwards producing an inverted result. - /// Only those elements that are also in the specified + /// Only those elements that are also in the specified /// range are included in the result. /// - + public LSL_Types.list llList2ListStrided(LSL_Types.list src, int start, int end, int stride) { @@ -3415,7 +3415,7 @@ namespace OpenSim.Region.ScriptEngine.Common if (end < 0) end = src.Length+end; - // Out of bounds indices are OK, just trim them + // Out of bounds indices are OK, just trim them // accordingly if (start > src.Length) @@ -3429,7 +3429,7 @@ namespace OpenSim.Region.ScriptEngine.Common if (start != end) { - if (start <= end) + if (start <= end) { si[0] = start; ei[0] = end; @@ -3448,8 +3448,8 @@ namespace OpenSim.Region.ScriptEngine.Common // fall within the specified sub-range. The specified // range values are inclusive. // A negative stride reverses the direction of the - // scan producing an inverted list as a result. - + // scan producing an inverted list as a result. + if (stride == 0) stride = 1; @@ -3492,7 +3492,7 @@ namespace OpenSim.Region.ScriptEngine.Common public LSL_Types.list llListInsertList(LSL_Types.list dest, LSL_Types.list src, int index) { - + LSL_Types.list pref = null; LSL_Types.list suff = null; @@ -3539,7 +3539,7 @@ namespace OpenSim.Region.ScriptEngine.Common /// Returns the index of the first occurrence of test /// in src. /// - + public LSL_Types.LSLInteger llListFindList(LSL_Types.list src, LSL_Types.list test) { @@ -3568,7 +3568,7 @@ namespace OpenSim.Region.ScriptEngine.Common } } } - + return index; } @@ -3632,12 +3632,12 @@ namespace OpenSim.Region.ScriptEngine.Common if (LLUUID.TryParse(id,out key)) { ScenePresence presence = World.GetScenePresence(key); - + if (presence != null) { return presence.Name; } - + if (World.GetSceneObjectPart(key) != null) { return World.GetSceneObjectPart(key).Name; @@ -3646,18 +3646,18 @@ namespace OpenSim.Region.ScriptEngine.Common return String.Empty; } - + public void llSetTextureAnim(int mode, int face, int sizex, int sizey, double start, double length, double rate) { m_host.AddScriptLPS(1); Primitive.TextureAnimation pTexAnim = new Primitive.TextureAnimation(); pTexAnim.Flags =(uint) mode; - + //ALL_SIDES if (face == -1) face = 255; - + pTexAnim.Face = (uint)face; pTexAnim.Length = (float)length; pTexAnim.Rate = (float)rate; @@ -3688,7 +3688,7 @@ namespace OpenSim.Region.ScriptEngine.Common LSL_Types.list ret = new LSL_Types.list(); object[] delimiters = new object[separators.Length + spacers.Length]; separators.Data.CopyTo(delimiters, 0); - spacers.Data.CopyTo(delimiters, separators.Length); + spacers.Data.CopyTo(delimiters, separators.Length); bool dfound = false; do { @@ -3735,7 +3735,7 @@ 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)) @@ -3790,14 +3790,14 @@ namespace OpenSim.Region.ScriptEngine.Common LLUUID key = new LLUUID(); if (LLUUID.TryParse(id, out key)) - { + { ScenePresence av = World.GetScenePresence(key); - + if (av != null) { if (llAvatarOnSitTarget() == id) { - // if the avatar is sitting on this object, then + // if the avatar is sitting on this object, then // we can unsit them. We don't want random scripts unsitting random people // Lets avoid the popcorn avatar scenario. av.StandUp(); @@ -3809,12 +3809,12 @@ namespace OpenSim.Region.ScriptEngine.Common // if the land is group owned and the object is group owned by the same group // or // if the object is owned by a person with estate access. - + ILandObject parcel = World.LandChannel.GetLandObject(av.AbsolutePosition.X, av.AbsolutePosition.Y); if (parcel != null) { - if (m_host.ObjectOwner == parcel.landData.ownerID || - (m_host.OwnerID == m_host.GroupID && m_host.GroupID == parcel.landData.groupID + if (m_host.ObjectOwner == parcel.landData.ownerID || + (m_host.OwnerID == m_host.GroupID && m_host.GroupID == parcel.landData.groupID && parcel.landData.isGroupOwned) || World.ExternalChecks.ExternalChecksCanBeGodLike(m_host.OwnerID)) { av.StandUp(); @@ -3822,7 +3822,7 @@ namespace OpenSim.Region.ScriptEngine.Common } } } - + } } @@ -3928,7 +3928,7 @@ namespace OpenSim.Region.ScriptEngine.Common m_host.AddScriptLPS(1); Primitive.ParticleSystem prules = new Primitive.ParticleSystem(); LSL_Types.Vector3 tempv = new LSL_Types.Vector3(); - + float tempf = 0; for (int i = 0; i < rules.Length; i += 2) @@ -3954,7 +3954,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.R = (float)tempv.x; prules.PartEndColor.G = (float)tempv.y; prules.PartEndColor.B = (float)tempv.z; @@ -3996,7 +3996,7 @@ namespace OpenSim.Region.ScriptEngine.Common // Xantor 03-May-2008 // Wiki: PSYS_SRC_TEXTURE string inventory item name or key of the particle texture - // "" = default texture. + // "" = default texture. case (int)BuiltIn_Commands_BaseClass.PSYS_SRC_TEXTURE: LLUUID tkey = LLUUID.Zero; @@ -4007,11 +4007,11 @@ namespace OpenSim.Region.ScriptEngine.Common } // 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 - else + else { prules.Texture = InventoryKey(rules.Data[i+1].ToString()); } - break; + break; case (int)BuiltIn_Commands_BaseClass.PSYS_SRC_BURST_RATE: tempf = Convert.ToSingle(rules.Data[i + 1].ToString()); @@ -4150,7 +4150,7 @@ namespace OpenSim.Region.ScriptEngine.Common m_host.AddScriptLPS(1); return m_host.GetAvatarOnSitTarget().ToString(); //LLUUID AVID = m_host.GetAvatarOnSitTarget(); - + //if (AVID != LLUUID.Zero) // return AVID.ToString(); //else @@ -4283,7 +4283,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 ((sm = m_ScriptEngine.m_ScriptManager) != null) sm.ResetScript(m_localID, item); @@ -4293,7 +4293,7 @@ namespace OpenSim.Region.ScriptEngine.Common if (script == null) ShoutError("llResetOtherScript: script "+name+" not found"); - // If we didn't find it, then it's safe to + // If we didn't find it, then it's safe to // assume it is not running. } @@ -4307,7 +4307,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 ((sm = m_ScriptEngine.m_ScriptManager) != null) @@ -4324,7 +4324,7 @@ namespace OpenSim.Region.ScriptEngine.Common if (script == null) ShoutError("llGetScriptState: script "+name+" not found"); - // If we didn't find it, then it's safe to + // If we didn't find it, then it's safe to // assume it is not running. return 0; @@ -4586,7 +4586,7 @@ namespace OpenSim.Region.ScriptEngine.Common { return; } - + if (landowner != m_host.ObjectOwner) { return; @@ -4857,7 +4857,7 @@ namespace OpenSim.Region.ScriptEngine.Common case 21: // PRIM_FLEXIBLE PrimitiveBaseShape shape = m_host.Shape; - + if (shape.FlexiEntry) res.Add(new LSL_Types.LSLInteger(1)); // active else @@ -4885,7 +4885,7 @@ namespace OpenSim.Region.ScriptEngine.Common case 23: // PRIM_POINT_LIGHT: shape = m_host.Shape; - + if (shape.LightEntry) res.Add(new LSL_Types.LSLInteger(1)); // active else @@ -4932,12 +4932,12 @@ namespace OpenSim.Region.ScriptEngine.Common // // // Each point in a base-64 string represents - // a 6 bit value. A 32-bit integer can be + // a 6 bit value. A 32-bit integer can be // represented using 6 characters (with some - // redundancy). + // redundancy). // // - // LSL requires a base64 string to be 8 + // LSL requires a base64 string to be 8 // characters in length. LSL also uses '/' // rather than '-' (MIME compliant). // @@ -4948,7 +4948,7 @@ namespace OpenSim.Region.ScriptEngine.Common // // SL do not record any kind of exception for // these functions, so the string to integer - // conversion returns '0' if an invalid + // conversion returns '0' if an invalid // character is encountered during conversion. // // @@ -4962,13 +4962,13 @@ namespace OpenSim.Region.ScriptEngine.Common // // // - + // // Table for converting 6-bit integers into // base-64 characters // - private static readonly char[] i2ctable = + private static readonly char[] i2ctable = { 'A','B','C','D','E','F','G','H', 'I','J','K','L','M','N','O','P', @@ -4992,7 +4992,7 @@ namespace OpenSim.Region.ScriptEngine.Common { -1,-1,-1,-1,-1,-1,-1,-1, // 0x -1,-1,-1,-1,-1,-1,-1,-1, - -1,-1,-1,-1,-1,-1,-1,-1, // 1x + -1,-1,-1,-1,-1,-1,-1,-1, // 1x -1,-1,-1,-1,-1,-1,-1,-1, -1,-1,-1,-1,-1,-1,-1,-1, // 2x -1,-1,-1,63,-1,-1,-1,64, @@ -5070,25 +5070,25 @@ namespace OpenSim.Region.ScriptEngine.Common // length strings return zero. // // - // Returns an integer representing the - // encoded value providedint he 1st 6 + // Returns an integer representing the + // encoded value providedint he 1st 6 // characters of the string. // // // This is coded to behave like LSL's // implementation (I think), based upon the // information available at the Wiki. - // If more than 8 characters are supplied, + // If more than 8 characters are supplied, // zero is returned. // If a NULL string is supplied, zero will // be returned. // If fewer than 6 characters are supplied, then - // the answer will reflect a partial + // the answer will reflect a partial // accumulation. // - // The 6-bit segments are - // extracted left-to-right in big-endian mode, - // which means that segment 6 only contains the + // The 6-bit segments are + // extracted left-to-right in big-endian mode, + // which means that segment 6 only contains the // two low-order bits of the 32 bit integer as // its high order 2 bits. A short string therefore // means loss of low-order information. E.g. @@ -5126,39 +5126,39 @@ namespace OpenSim.Region.ScriptEngine.Common return digit<0?(int)0:number; } number += --digit<<26; - + if ((digit=c2itable[str[1]])<=0) { return digit<0?(int)0:number; } number += --digit<<20; - + if ((digit=c2itable[str[2]])<=0) { return digit<0?(int)0:number; } number += --digit<<14; - + if ((digit=c2itable[str[3]])<=0) { return digit<0?(int)0:number; } number += --digit<<8; - + if ((digit=c2itable[str[4]])<=0) { return digit<0?(int)0:number; } number += --digit<<2; - + if ((digit=c2itable[str[5]])<=0) { return digit<0?(int)0:number; } number += --digit>>4; - + // ignore trailing padding - + return number; } @@ -5182,8 +5182,8 @@ namespace OpenSim.Region.ScriptEngine.Common // // Scan the string supplied in 'src' and - // tokenize it based upon two sets of - // tokenizers provided in two lists, + // tokenize it based upon two sets of + // tokenizers provided in two lists, // separators and spacers. // // @@ -5196,38 +5196,38 @@ namespace OpenSim.Region.ScriptEngine.Common // Both separators and spacers may be arbitrarily // long strings. i.e. ":::". // - // The function returns an ordered list + // The function returns an ordered list // representing the tokens found in the supplied // sources string. If two successive tokenizers // are encountered, then a NULL entry is added // to the list. // - // It is a precondition that the source and + // It is a precondition that the source and // toekizer lisst are non-null. If they are null, - // then a null pointer exception will be thrown + // then a null pointer exception will be thrown // while their lengths are being determined. // // A small amount of working memoryis required // of approximately 8*#tokenizers. // - // There are many ways in which this function - // can be implemented, this implementation is + // There are many ways in which this function + // can be implemented, this implementation is // fairly naive and assumes that when the // function is invooked with a short source // string and/or short lists of tokenizers, then // performance will not be an issue. // - // In order to minimize the perofrmance + // In order to minimize the perofrmance // effects of long strings, or large numbers // of tokeizers, the function skips as far as - // possible whenever a toekenizer is found, + // possible whenever a toekenizer is found, // and eliminates redundant tokenizers as soon // as is possible. // // The implementation tries to avoid any copying // of arrays or other objects. // - + public LSL_Types.list llParseStringKeepNulls(string src, LSL_Types.list separators, LSL_Types.list spacers) { int beginning = 0; @@ -5256,7 +5256,7 @@ namespace OpenSim.Region.ScriptEngine.Common active[i] = true; offset[mlen] = srclen; - + while (beginning < srclen) { @@ -5270,7 +5270,7 @@ namespace OpenSim.Region.ScriptEngine.Common { // scan all of the markers if ((offset[j] = src.IndexOf((string)separray[j],beginning)) == -1) - { + { // not present at all active[j] = false; } @@ -5278,7 +5278,7 @@ namespace OpenSim.Region.ScriptEngine.Common { // present and correct if (offset[j] < offset[best]) - { + { // closest so far best = j; if (offset[best] == beginning) @@ -5293,19 +5293,19 @@ namespace OpenSim.Region.ScriptEngine.Common if (offset[best] != beginning) { for (j = seplen; (j < mlen) && (offset[best] > beginning); j++) - { + { if (active[j]) { // scan all of the markers if ((offset[j] = src.IndexOf((string)spcarray[j-seplen],beginning)) == -1) - { + { // not present at all active[j] = false; } else { // present and correct if (offset[j] < offset[best]) - { + { // closest so far best = j; } @@ -5317,7 +5317,7 @@ namespace OpenSim.Region.ScriptEngine.Common // This is the normal exit from the scanning loop if (best == mlen) - { + { // no markers were found on this pass // so we're pretty much done tokens.Add(src.Substring(beginning, srclen-beginning)); @@ -5478,7 +5478,7 @@ namespace OpenSim.Region.ScriptEngine.Common //should be similar to : llInstantMessage(llGetOwner(),msg) // llGetOwner ==> m_host.ObjectOwner.ToString() llInstantMessage(m_host.ObjectOwner.ToString(),msg); - + //World.SimChat(Helpers.StringToField(msg), ChatTypeEnum.Owner, 0, m_host.AbsolutePosition, m_host.Name, m_host.UUID); //IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface(); //wComm.DeliverMessage(ChatTypeEnum.Owner, 0, m_host.Name, m_host.UUID, msg); @@ -5509,19 +5509,19 @@ namespace OpenSim.Region.ScriptEngine.Common /// /// illListReplaceList removes the sub-list defined by the inclusive indices - /// start and end and inserts the src list in its place. The inclusive + /// start and end and inserts the src list in its place. The inclusive /// nature of the indices means that at least one element must be deleted /// if the indices are within the bounds of the existing list. I.e. 2,2 /// will remove the element at index 2 and replace it with the source /// list. Both indices may be negative, with the usual interpretation. An - /// interesting case is where end is lower than start. As these indices + /// interesting case is where end is lower than start. As these indices /// bound the list to be removed, then 0->end, and start->lim are removed /// and the source list is added as a suffix. /// public LSL_Types.list llListReplaceList(LSL_Types.list dest, LSL_Types.list src, int start, int end) { - + LSL_Types.list pref = null; m_host.AddScriptLPS(1); @@ -5542,9 +5542,9 @@ namespace OpenSim.Region.ScriptEngine.Common // list. if (start <= end) { - // If greater than zero, then there is going to be a - // surviving prefix. Otherwise the inclusive nature - // of the indices mean that we're going to add the + // If greater than zero, then there is going to be a + // surviving prefix. Otherwise the inclusive nature + // of the indices mean that we're going to add the // source list as a prefix. if (start > 0) { @@ -5580,7 +5580,7 @@ namespace OpenSim.Region.ScriptEngine.Common } // Finally, if start > end, we strip away a prefix and // a suffix, to leave the list that sits ens - // and start, and then tag on the src list. AT least + // and start, and then tag on the src list. AT least // that's my interpretation. We can get sublist to do // this for us. Note that one, or both of the indices // might have been negative. @@ -6084,7 +6084,7 @@ namespace OpenSim.Region.ScriptEngine.Common if (LLUUID.TryParse(id, out key)) { ScenePresence av = World.GetScenePresence(key); - + if (av != null) { foreach (object o in args.Data) @@ -6103,7 +6103,7 @@ namespace OpenSim.Region.ScriptEngine.Common case "4": 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": + case "5": ret.Add(new LSL_Types.Vector3(av.Velocity.X,av.Velocity.Y,av.Velocity.Z)); break; case "6": diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs index e031c01..c8c51f8 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs @@ -493,7 +493,7 @@ namespace OpenSim.Region.ScriptEngine.Common // now, this makes the math easier int remove=end+1-start; - + ret=new Object[m_data.Length-remove]; if (ret.Length == 0) return new list(ret); @@ -519,7 +519,7 @@ namespace OpenSim.Region.ScriptEngine.Common // NOTE that either index may still be negative after // adding the length, so we must take additional // measures to protect against this. Note also that - // after normalisation the negative indices are no + // after normalisation the negative indices are no // longer relative to the end of the list. if (start < 0) @@ -533,7 +533,7 @@ namespace OpenSim.Region.ScriptEngine.Common } // The conventional case is start <= end - // NOTE that the case of an empty list is + // NOTE that the case of an empty list is // dealt with by the initial test. Start // less than end is taken to be the most // common case. @@ -553,7 +553,7 @@ namespace OpenSim.Region.ScriptEngine.Common { end = m_data.Length - 1; } - + // Sublist still starts before the beginning of the list if (start < 0) { @@ -561,7 +561,7 @@ namespace OpenSim.Region.ScriptEngine.Common } ret = new object[end - start + 1]; - + Array.Copy(m_data, start, ret, 0, end - start + 1); return new list(ret); @@ -580,7 +580,7 @@ namespace OpenSim.Region.ScriptEngine.Common { result = new list(); // If start is still negative, then the whole of - // the existing list is returned. This case is + // the existing list is returned. This case is // only admitted if end is also still negative. if (start < 0) { @@ -593,7 +593,7 @@ namespace OpenSim.Region.ScriptEngine.Common result = GetSublist(0,end); } - // If start is outside of list, then just return + // If start is outside of list, then just return // the prefix, whatever it is. if (start >= m_data.Length) { @@ -896,7 +896,7 @@ namespace OpenSim.Region.ScriptEngine.Common } } - #endregion + #endregion public string ToPrettyString() { @@ -962,7 +962,7 @@ namespace OpenSim.Region.ScriptEngine.Common } // - // BELOW IS WORK IN PROGRESS... IT WILL CHANGE, SO DON'T USE YET! :) + // BELOW IS WORK IN PROGRESS... IT WILL CHANGE, SO DON'T USE YET! :) // public struct StringTest @@ -1103,7 +1103,7 @@ namespace OpenSim.Region.ScriptEngine.Common } } - + static public implicit operator String(LSLString s) { @@ -1267,7 +1267,7 @@ namespace OpenSim.Region.ScriptEngine.Common i.value++; return i; } - + public static LSLInteger operator --(LSLInteger i) { diff --git a/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs index 2b6f6d9..03d3a41 100644 --- a/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs @@ -268,7 +268,7 @@ namespace OpenSim.Region.ScriptEngine.Common return 0; } } - + public double osTerrainGetHeight(int x, int y) { m_host.AddScriptLPS(1); @@ -448,7 +448,7 @@ namespace OpenSim.Region.ScriptEngine.Common } } - //Texture draw functions + //Texture draw functions public string osMovePen(string drawList, int x, int y) { m_host.AddScriptLPS(1); diff --git a/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands_Interface.cs b/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands_Interface.cs index 2d58b57..aa9c8c7 100644 --- a/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands_Interface.cs +++ b/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands_Interface.cs @@ -60,7 +60,7 @@ namespace OpenSim.Region.ScriptEngine.Common string osSetPenSize(string drawList, int penSize); string osSetPenColour(string drawList, string colour); string osDrawImage(string drawList, int width, int height, string imageUrl); - void osSetStateEvents(int events); + void osSetStateEvents(int events); } } diff --git a/OpenSim/Region/ScriptEngine/Common/Properties/AssemblyInfo.cs b/OpenSim/Region/ScriptEngine/Common/Properties/AssemblyInfo.cs index f438120..335d1a0 100644 --- a/OpenSim/Region/ScriptEngine/Common/Properties/AssemblyInfo.cs +++ b/OpenSim/Region/ScriptEngine/Common/Properties/AssemblyInfo.cs @@ -28,7 +28,7 @@ using System.Reflection; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following +// General information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. @@ -41,8 +41,8 @@ using System.Runtime.InteropServices; [assembly : AssemblyTrademark("")] [assembly : AssemblyCulture("")] -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. [assembly : ComVisible(false)] @@ -54,7 +54,7 @@ using System.Runtime.InteropServices; // Version information for an assembly consists of the following four values: // // Major Version -// Minor Version +// Minor Version // Build Number // Revision // diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandManager.cs index f3af621..2a0ed37 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandManager.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandManager.cs @@ -115,7 +115,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase Thread.Sleep(cmdHandlerThreadCycleSleepms); //lock (ScriptEngine.ScriptEngines) //{ - foreach (ScriptEngine se in new ArrayList(ScriptEngine.ScriptEngines)) + foreach (ScriptEngine se in new ArrayList(ScriptEngine.ScriptEngines)) { se.m_ASYNCLSLCommandManager.DoOneCmdHandlerPass(); } @@ -176,7 +176,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase #region Check llRemoteData channels - + #endregion #region Check llListeners diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs index 4311836..13c9d25 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs @@ -218,7 +218,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugin objtype |= 0x04; // passive non-moving else objtype |= 0x02; // active moving - if (ent is IScript) objtype |= 0x08; // Scripted. It COULD have one hidden ... + if (ent is IScript) objtype |= 0x08; // Scripted. It COULD have one hidden ... if (((ts.type & objtype) != 0) || ((ts.type & objtype) == ts.type)) { diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Timer.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Timer.cs index 141e471..6f88e11 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Timer.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Timer.cs @@ -94,7 +94,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugin } } - // Old method: Create new list + // Old method: Create new list //List NewTimers = new List(); //foreach (TimerClass ts in Timers) //{ diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs index 715e465..fc005ab 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs @@ -39,7 +39,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase /// public class MaintenanceThread : iScriptEngineFunctionModule { - + private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); //public ScriptEngine m_ScriptEngine; @@ -238,6 +238,6 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase // get { return _PleaseShutdown; } // set { _PleaseShutdown = value; } //} - //private bool _PleaseShutdown = false; + //private bool _PleaseShutdown = false; } } diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs index a7ad50d..b0c6314 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs @@ -38,7 +38,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase /// /// This is the root object for ScriptEngine. Objects access each other trough this class. /// - /// + /// [Serializable] public abstract class ScriptEngine : IRegionModule, ScriptServerInterfaces.ScriptEngine, iScriptEngineFunctionModule { @@ -154,7 +154,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase #region IRegionModule public abstract void Initialise(Scene scene, IConfigSource config); - + public void PostInitialise() { } diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs index 2233913..c84975a 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs @@ -41,7 +41,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase /// Compiles them if necessary /// Execute functions for EventQueueManager (Sends them to script on other AppDomain for execution) /// - /// + /// // This class is as close as you get to the script without being inside script class. It handles all the dirty work for other classes. // * Keeps track of running scripts @@ -212,7 +212,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase if (LUQueue.Count > 0) { LUStruct item = LUQueue.Dequeue(); - + if (item.Action == LUType.Unload) { _StopScript(item.localID, item.itemID); @@ -224,7 +224,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase } } } - + #endregion #region Helper functions diff --git a/OpenSim/Region/ScriptEngine/Common/TRPC/TCPServer.cs b/OpenSim/Region/ScriptEngine/Common/TRPC/TCPServer.cs index 55a20e7..26892a2 100644 --- a/OpenSim/Region/ScriptEngine/Common/TRPC/TCPServer.cs +++ b/OpenSim/Region/ScriptEngine/Common/TRPC/TCPServer.cs @@ -33,7 +33,7 @@ using System.Net.Sockets; namespace OpenSim.Region.ScriptEngine.Common.TRPC { - public class TCPServer: TCPCommon.ServerInterface + public class TCPServer: TCPCommon.ServerInterface { public readonly int LocalPort; public TCPServer(int localPort) diff --git a/OpenSim/Region/ScriptEngine/Common/TRPC_Remote.cs b/OpenSim/Region/ScriptEngine/Common/TRPC_Remote.cs index c293ecb..a310978 100644 --- a/OpenSim/Region/ScriptEngine/Common/TRPC_Remote.cs +++ b/OpenSim/Region/ScriptEngine/Common/TRPC_Remote.cs @@ -44,7 +44,7 @@ namespace OpenSim.Region.ScriptEngine.Common public delegate void ReceiveCommandDelegate(int ID, string Command, params object[] p); public event ReceiveCommandDelegate ReceiveCommand; Dictionary TypeDictionary = new Dictionary(); - Type[] Types = + Type[] Types = { typeof(String), typeof(Int16), diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs index 1d71182..f661162 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs @@ -39,9 +39,9 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL { public class Compiler { - private static readonly log4net.ILog m_log + private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); - + // * Uses "LSL2Converter" to convert LSL to C# if necessary. // * Compiles C#-code into an assembly // * Returns assembly name ready for AppDomain load. @@ -278,8 +278,8 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL if (enableCommanderLSL == true && l == enumCompileType.cs) { - foreach (KeyValuePair com + foreach (KeyValuePair com in m_scriptEngine.World.GetCommanders()) { compileScript = com.Value.GenerateRuntimeAPI() + compileScript; @@ -305,7 +305,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL m_log.Debug("[ScriptEngine.DotNetEngine]: Preparing to compile the following LSL to C# translated code"); m_log.Debug(""); m_log.Debug(compileScript); - + return CompileFromDotNetText(compileScript, l); } @@ -322,7 +322,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL private static string CreateCSCompilerScript(string compileScript) { - + compileScript = String.Empty + "using OpenSim.Region.ScriptEngine.Common; using System.Collections.Generic;\r\n" + diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs index 2100900..1832864 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs @@ -23,7 +23,7 @@ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -* +* */ using System; @@ -32,17 +32,13 @@ using System.Text.RegularExpressions; namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL { - public class LSL2CSConverter { - - // Uses regex to convert LSL code to C# code. //private Regex rnw = new Regex(@"[a-zA-Z0-9_\-]", RegexOptions.Compiled); private Dictionary dataTypes = new Dictionary(); private Dictionary quotes = new Dictionary(); - public LSL2CSConverter() { @@ -72,7 +68,6 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL Script = Regex.Replace(Script, @"\r\n", "\n"); Script = Regex.Replace(Script, @"\n", "\r\n"); - // QUOTE REPLACEMENT // temporarily replace quotes so we can work our magic on the script without // always considering if we are inside our outside quotes's @@ -86,21 +81,16 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL bool last_was_escape = false; int quote_replaced_count = 0; - - string[] blocked = new string[] {"Axiom","Db4objects","libsecondlife","log4net","Microsoft", "Modified","Mono","MonoXnaCompactMaths","mscorlib","MySql", "NHibernate","Nini","nunit","Ode","OpenSim","PhysX_Wrapper_Dotnet", "PumaCode","RAIL","XMLRPC","System"}; - for (int p = 0; p < blocked.Length;p++) { - Match SecurityM = Regex.Match(Script, "[;}][^\"']+" + blocked[p].Replace(".", "\\.") + "\\.[^\"']", RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.Singleline); if (SecurityM.Success) throw new Exception("CS0103: 'The name '" + blocked[p] + "' does not exist in the current context'"); - } for (int p = 0; p < Script.Length; p++) @@ -166,7 +156,6 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL // END OF QUOTE REPLACEMENT // - // // PROCESS STATES // Remove state definitions and add state names to start of each event within state @@ -194,7 +183,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL // if level == 0, add to return if (ilevel == 1 && lastlevel == 0) { - // 0 => 1: Get last + // 0 => 1: Get last Match m = //Regex.Match(cache, @"(?![a-zA-Z_]+)\s*([a-zA-Z_]+)[^a-zA-Z_\(\)]*{", Regex.Match(cache, @"(?![a-zA-Z_]+)\s*(state\s+)?(?[a-zA-Z_][a-zA-Z_0-9]*)[^a-zA-Z_0-9\(\)]*{", @@ -253,7 +242,6 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL Script = ret; ret = String.Empty; - foreach (string key in dataTypes.Keys) { string val; @@ -291,7 +279,6 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL Regex.Replace(Script, @"\[([^\]]*)\]", @"new LSL_Types.list($1)", RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.Singleline); - // Replace (string) to .ToString() // Script = Regex.Replace(Script, @"\(string\)\s*([a-zA-Z0-9_.]+(\s*\([^\)]*\))?)", @"$1.ToString()", @@ -313,12 +300,9 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL Script = Script.Replace(key, "\"" + val + "\""); } - - //System.Console.WriteLine(Script); Return = String.Empty;// + //"using OpenSim.Region.ScriptEngine.Common; using System.Collections.Generic;"; - //Return += String.Empty + // "namespace SecondLife { "; @@ -328,13 +312,10 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL //Return += @"public Script() { } "; Return += Script; //Return += "} }\r\n"; - + quotes.Clear(); - + return Return; } - } - - } diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Properties/AssemblyInfo.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Properties/AssemblyInfo.cs index bce9cfc..799aa92 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/Properties/AssemblyInfo.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Properties/AssemblyInfo.cs @@ -28,7 +28,7 @@ using System.Reflection; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following +// General information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. @@ -41,8 +41,8 @@ using System.Runtime.InteropServices; [assembly : AssemblyTrademark("")] [assembly : AssemblyCulture("")] -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. [assembly : ComVisible(false)] @@ -54,11 +54,11 @@ using System.Runtime.InteropServices; // Version information for an assembly consists of the following four values: // // Major Version -// Minor Version +// Minor Version // Build Number // Revision // -// You can specify all the values or you can default the Revision and Build Numbers +// You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: [assembly : AssemblyVersion("1.0.0.0")] diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs index ed2c0a3..55289d9 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs @@ -102,7 +102,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine // Fire the first start-event int eventFlags = m_scriptEngine.m_ScriptManager.GetStateEventFlags(localID, itemID); - m_host.SetScriptEvents(itemID, eventFlags); + m_host.SetScriptEvents(itemID, eventFlags); m_scriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, "state_entry", EventQueueManager.llDetectNull, new object[] { }); } catch (Exception e) // LEGIT: User Scripting diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/Engine.cs b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/Engine.cs index 0208350..f53772e 100644 --- a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/Engine.cs +++ b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/Engine.cs @@ -168,7 +168,7 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO Common.SendToDebug("IL_CREATE_CONSTRUCTOR()"); //ConstructorBuilder constructor = typeBuilder.DefineConstructor( // MethodAttributes.Public, - // CallingConventions.Standard, + // CallingConventions.Standard, // new Type[0]); ConstructorBuilder constructor = typeBuilder.DefineConstructor( MethodAttributes.Public | @@ -192,8 +192,8 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO //// Create state object //FieldName = "State"; //FieldBuilder State_fb = typeBuilder.DefineField( - // FieldName, - // typeof(UInt32), + // FieldName, + // typeof(UInt32), // FieldAttributes.Public); //il.Emit(OpCodes.Ldarg_0); //il.Emit(OpCodes.Ldc_I4, 0); @@ -206,8 +206,8 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO //FieldName = "LSL_BuiltIns"; //FieldBuilder LSL_BuiltIns_fb = typeBuilder.DefineField( - // FieldName, - // objType1, + // FieldName, + // objType1, // FieldAttributes.Public); ////LSL_BuiltIn_Commands_TestImplementation _ti = new LSL_BuiltIn_Commands_TestImplementation(); diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSL_BaseClass_OPCODES.cs b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSL_BaseClass_OPCODES.cs index 1b73311..7805aa3 100644 --- a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSL_BaseClass_OPCODES.cs +++ b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSL_BaseClass_OPCODES.cs @@ -34,9 +34,9 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO // * // * These are internal "assembly" commands, // * basic operators like "ADD", "PUSH" and "POP" - // * + // * // * It also contains managed stack and keeps track of internal variables, etc. - // * + // * // */ diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs index 06ae1e9..b2a2f25 100644 --- a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs +++ b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs @@ -69,14 +69,12 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO fs.Close(); } - /// /// Parse LSO file. /// public void Parse() { - // The LSO Format consist of 6 major blocks: header, statics, functions, states, heap, and stack. - + // The LSO Format consist of 6 major blocks: header, statics, functions, states, heap, and stack. // HEADER BLOCK Common.SendToDebug("Reading HEADER BLOCK at: 0"); @@ -156,7 +154,6 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO } Common.SendToDebug("Number of Static Blocks read: " + StaticBlockCount); - // FUNCTION BLOCK // Always right after STATIC BLOCK LSO_Struct.FunctionBlock myFunctionBlock = new LSO_Struct.FunctionBlock(); @@ -186,7 +183,6 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO } } - // STATE FRAME BLOCK // Always right after FUNCTION BLOCK Common.SendToDebug("Reading STATE BLOCK at: " + myHeader.SR); @@ -213,7 +209,6 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO } } - // STATE BLOCK // For each StateFrameBlock there is one StateBlock with multiple event handlers @@ -239,7 +234,6 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO // We need to count number of bits flagged in EventMask? - // for each bit in myStateFrameBlock.StatePointer[i].EventMask // ADDING TO ALL RIGHT NOW, SHOULD LIMIT TO ONLY THE ONES IN USE @@ -273,7 +267,6 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO } } - //// READ FUNCTION CODE CHUNKS //// Functions + Function start pos (GFR) //// TODO: Somehow be able to identify and reference this @@ -293,7 +286,7 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO { for (int i = 0; i < myStateFrameBlock.StateCount; i++) { - // TODO: Somehow organize events and functions so they can be found again, + // TODO: Somehow organize events and functions so they can be found again, // two level search ain't no good for (int ii = 0; ii < myStateFrameBlock.StatePointer[i].EventMask.Count - 1; ii++) { @@ -320,7 +313,6 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO } } - if (Common.IL_CreateFunctionList) IL_INSERT_FUNCTIONLIST(); } @@ -371,7 +363,7 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO //private byte[] br_read_smallendian(int len) //{ - // byte[] bytes = new byte[len]; + // byte[] bytes = new byte[len]; // br.Read(bytes,0, len); // return bytes; //} @@ -459,7 +451,6 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO Common.SendToDebug("Return type #" + myCodeChunk.ReturnType.ObjectType + ": " + ((LSO_Enums.Variable_Type_Codes) myCodeChunk.ReturnType.ObjectType).ToString()); - // TODO: How to determine number of codechunks -- does this method work? myCodeChunk.CodeChunkArguments = new List(); byte reader = br_read(1)[0]; @@ -492,7 +483,6 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO // End marker is 0x000 myCodeChunk.EndMarker = reader; - // // Emit: START OF METHOD (FUNCTION) // @@ -515,11 +505,9 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO Common.SendToDebug("CLR:" + eventname + ":ILGenerator il = methodBuilder.GetILGenerator();"); ILGenerator il = methodBuilder.GetILGenerator(); - if (Common.IL_UseTryCatch) IL_INSERT_TRY(il, eventname); - // Push Console.WriteLine command to stack ... Console.WriteLine("Hello World!"); //Common.SendToDebug("CLR:" + eventname + ":il.Emit(OpCodes.Call..."); //il.Emit(OpCodes.Call, typeof(Console).GetMethod @@ -534,7 +522,6 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO il.Emit(OpCodes.Ldarg, _ic); } - // // CALLING OPCODE PROCESSOR, one command at the time TO GENERATE IL // @@ -544,7 +531,6 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO FoundRet = LSL_PROCESS_OPCODE(il); } - if (Common.IL_UseTryCatch) IL_INSERT_END_TRY(il, eventname); @@ -558,17 +544,14 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO { Common.SendToDebug("Creating function list"); - string eventname = "GetFunctions"; Common.SendToDebug("Creating IL " + eventname); // Define a private String field. //FieldBuilder myField = myTypeBuilder.DefineField("EventList", typeof(String[]), FieldAttributes.Public); - //FieldBuilder mem = typeBuilder.DefineField("mem", typeof(Array), FieldAttributes.Private); - MethodBuilder methodBuilder = typeBuilder.DefineMethod(eventname, MethodAttributes.Public, typeof (string[]), @@ -579,7 +562,6 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO ILGenerator il = methodBuilder.GetILGenerator(); - // IL_INSERT_TRY(il, eventname); // // Push string to stack @@ -615,17 +597,14 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO //il.Emit(OpCodes.Call, typeof(LSL_BaseClass).GetMethod("AddFunction", new Type[] { typeof(string) })); } - // IL_INSERT_END_TRY(il, eventname); - il.Emit(OpCodes.Ldloc_0); // Load local variable 0 onto stack // il.Emit(OpCodes.Call, typeof(LSL_BaseClass).GetMethod("SetFunctionList", new Type[] { typeof(Array) })); il.Emit(OpCodes.Ret); // Return } - private void IL_INSERT_TRY(ILGenerator il, string eventname) { /* @@ -687,7 +666,6 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO { Common.SendToDebug("Found cached STATIC BLOCK"); - return StaticBlocks[pos]; } diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/Properties/AssemblyInfo.cs b/OpenSim/Region/ScriptEngine/LSOEngine/Properties/AssemblyInfo.cs index 78b44a0..5210ff0 100644 --- a/OpenSim/Region/ScriptEngine/LSOEngine/Properties/AssemblyInfo.cs +++ b/OpenSim/Region/ScriptEngine/LSOEngine/Properties/AssemblyInfo.cs @@ -28,7 +28,7 @@ using System.Reflection; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following +// General information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. @@ -41,8 +41,8 @@ using System.Runtime.InteropServices; [assembly : AssemblyTrademark("")] [assembly : AssemblyCulture("")] -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. [assembly : ComVisible(false)] @@ -54,11 +54,11 @@ using System.Runtime.InteropServices; // Version information for an assembly consists of the following four values: // // Major Version -// Minor Version +// Minor Version // Build Number // Revision // -// You can specify all the values or you can default the Revision and Build Numbers +// You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: [assembly : AssemblyVersion("1.0.0.0")] diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/LSOEngine/ScriptManager.cs index 20d1a58..617d6f6 100644 --- a/OpenSim/Region/ScriptEngine/LSOEngine/ScriptManager.cs +++ b/OpenSim/Region/ScriptEngine/LSOEngine/ScriptManager.cs @@ -92,7 +92,7 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine // Fire the first start-event int eventFlags = m_scriptEngine.m_ScriptManager.GetStateEventFlags(localID, itemID); - m_host.SetScriptEvents(itemID, eventFlags); + m_host.SetScriptEvents(itemID, eventFlags); m_scriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, "state_entry", EventQueueManager.llDetectNull, new object[] { }); } catch (Exception e) // LEGIT - User Script Compilation diff --git a/OpenSim/Region/ScriptEngine/RemoteServer/Properties/AssemblyInfo.cs b/OpenSim/Region/ScriptEngine/RemoteServer/Properties/AssemblyInfo.cs index 70a84f1..77d9b10 100644 --- a/OpenSim/Region/ScriptEngine/RemoteServer/Properties/AssemblyInfo.cs +++ b/OpenSim/Region/ScriptEngine/RemoteServer/Properties/AssemblyInfo.cs @@ -28,7 +28,7 @@ using System.Reflection; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following +// General information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. @@ -41,8 +41,8 @@ using System.Runtime.InteropServices; [assembly : AssemblyTrademark("")] [assembly : AssemblyCulture("")] -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. [assembly : ComVisible(false)] @@ -54,11 +54,11 @@ using System.Runtime.InteropServices; // Version information for an assembly consists of the following four values: // // Major Version -// Minor Version +// Minor Version // Build Number // Revision // -// You can specify all the values or you can default the Revision and Build Numbers +// You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: [assembly : AssemblyVersion("1.0.0.0")] diff --git a/OpenSim/Region/ScriptEngine/RemoteServer/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/RemoteServer/ScriptEngine.cs index c33cfd1..8754516 100644 --- a/OpenSim/Region/ScriptEngine/RemoteServer/ScriptEngine.cs +++ b/OpenSim/Region/ScriptEngine/RemoteServer/ScriptEngine.cs @@ -39,7 +39,7 @@ namespace OpenSim.Region.ScriptEngine.RemoteServer /// /// This is the root object for RemoteServer. Objects access each other trough this class. /// - /// + /// [Serializable] public class ScriptEngine : IRegionModule { -- cgit v1.1