From b16abc8166c29585cb76cc55c3bdd76e5833cb4f Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Thu, 5 Jan 2017 19:07:37 +0000 Subject: Massive tab and trailing space cleanup --- .../Api/Implementation/AsyncCommandManager.cs | 44 ++++---- .../Shared/Api/Implementation/LSL_Api.cs | 118 ++++++++++----------- .../Shared/Api/Implementation/LS_Api.cs | 2 +- .../Shared/Api/Implementation/MOD_Api.cs | 74 ++++++------- .../Shared/Api/Implementation/OSSL_Api.cs | 106 +++++++++--------- .../Api/Implementation/Plugins/SensorRepeat.cs | 14 +-- .../Shared/Api/Implementation/Plugins/Timer.cs | 2 +- .../Api/Implementation/Properties/AssemblyInfo.cs | 8 +- .../ScriptEngine/Shared/Api/Interface/IMOD_Api.cs | 2 +- .../ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | 8 +- .../Shared/Api/Runtime/LSL_Constants.cs | 2 +- .../ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs | 4 +- .../ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | 14 +-- .../Shared/Api/Runtime/Properties/AssemblyInfo.cs | 8 +- 14 files changed, 203 insertions(+), 203 deletions(-) (limited to 'OpenSim/Region/ScriptEngine/Shared/Api') diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs index 84d44a1..6a39bb9 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs @@ -81,64 +81,64 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public Dataserver DataserverPlugin { - get - { + get + { lock (staticLock) - return m_Dataserver[m_ScriptEngine]; + return m_Dataserver[m_ScriptEngine]; } } public Timer TimerPlugin { - get - { + get + { lock (staticLock) - return m_Timer[m_ScriptEngine]; + return m_Timer[m_ScriptEngine]; } } public HttpRequest HttpRequestPlugin { - get - { + get + { lock (staticLock) - return m_HttpRequest[m_ScriptEngine]; + return m_HttpRequest[m_ScriptEngine]; } } public Listener ListenerPlugin { - get - { + get + { lock (staticLock) - return m_Listener[m_ScriptEngine]; + return m_Listener[m_ScriptEngine]; } } public SensorRepeat SensorRepeatPlugin { - get - { + get + { lock (staticLock) - return m_SensorRepeat[m_ScriptEngine]; + return m_SensorRepeat[m_ScriptEngine]; } } public XmlRequest XmlRequestPlugin { - get - { + get + { lock (staticLock) - return m_XmlRequest[m_ScriptEngine]; + return m_XmlRequest[m_ScriptEngine]; } } public IScriptEngine[] ScriptEngines { - get - { + get + { lock (staticLock) - return m_ScriptEngines.ToArray(); + return m_ScriptEngines.ToArray(); } } @@ -387,7 +387,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api } } - + public static Object[] GetSerializationData(IScriptEngine engine, UUID itemID) { diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 5269bf9..8f9ff03 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs @@ -100,7 +100,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api protected IScriptEngine m_ScriptEngine; protected SceneObjectPart m_host; - + /// /// The item that hosts this script /// @@ -298,7 +298,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api m_host = host; m_item = item; m_debuggerSafe = m_ScriptEngine.Config.GetBoolean("DebuggerSafe", false); - + LoadConfig(); m_TransferModule = @@ -400,7 +400,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api } IConfig smtpConfig = seConfigSource.Configs["SMTP"]; - if (smtpConfig != null) + if (smtpConfig != null) { // there's an smtp config, so load in the snooze time. EMAIL_PAUSE_TIME = smtpConfig.GetInt("email_pause_time", EMAIL_PAUSE_TIME); @@ -666,7 +666,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api case ScriptBaseClass.LINK_SET: return new List(part.ParentGroup.Parts); - case ScriptBaseClass.LINK_ROOT: + case ScriptBaseClass.LINK_ROOT: ret.Add(part.ParentGroup.RootPart); return ret; @@ -807,8 +807,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api m_host.AddScriptLPS(1); lock (Util.RandomClass) { - return Util.RandomClass.NextDouble() * mag; - } + return Util.RandomClass.NextDouble() * mag; + } } public LSL_Integer llFloor(double f) @@ -1097,7 +1097,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api m_host.AddScriptLPS(1); /* This method is more accurate than the SL one, and thus causes problems for scripts that deal with the SL inaccuracy around 180-degrees -.- .._. - + double dotProduct = LSL_Vector.Dot(a, b); LSL_Vector crossProduct = LSL_Vector.Cross(a, b); double magProduct = LSL_Vector.Mag(a) * LSL_Vector.Mag(b); @@ -1115,12 +1115,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api return new LSL_Rotation((float)x, (float)y, (float)z, (float)w); */ - + // This method mimics the 180 errors found in SL // See www.euclideanspace.com... angleBetween LSL_Vector vec_a = a; LSL_Vector vec_b = b; - + // Eliminate zero length LSL_Float vec_a_mag = LSL_Vector.Mag(vec_a); LSL_Float vec_b_mag = LSL_Vector.Mag(vec_b); @@ -1129,7 +1129,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { return new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f); } - + // Normalize vec_a = llVecNorm(vec_a); vec_b = llVecNorm(vec_b); @@ -1137,13 +1137,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api // Calculate axis and rotation angle LSL_Vector axis = vec_a % vec_b; LSL_Float cos_theta = vec_a * vec_b; - + // Check if parallel if (cos_theta > 0.99999) { return new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f); } - + // Check if anti-parallel else if (cos_theta < -0.99999) { @@ -1164,7 +1164,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api return new LSL_Rotation(x,y,z,s); } } - + public void llWhisper(int channelID, string text) { m_host.AddScriptLPS(1); @@ -1261,7 +1261,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { World.SimChat(Utils.StringToBytes(text), ChatTypeEnum.Shout, channelID, m_host.ParentGroup.RootPart.AbsolutePosition, m_host.Name, m_host.UUID, true); - + } IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface(); @@ -1830,7 +1830,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { m_host.AddScriptLPS(1); SceneObjectGroup group = m_host.ParentGroup; - + if (group == null || group.IsDeleted || group.inTransit) return 1.0f; @@ -1841,7 +1841,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { m_host.AddScriptLPS(1); SceneObjectGroup group = m_host.ParentGroup; - + if (group == null || group.IsDeleted || group.inTransit) return 1.0f; @@ -1970,7 +1970,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api string userAgent = m_UrlModule.GetHttpHeader(new UUID(id), "user-agent"); if (userAgent.IndexOf("SecondLife") < 0) return; // Not the embedded browser. Is this check good enough? - + // Use the IP address of the client and check against the request // seperate logins from the same IP will allow all of them to get non-text/plain as long // as the owner is in the region. Same as SL! @@ -2030,7 +2030,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api m_UrlModule.HttpContentType(new UUID(id),type); } } -*/ +*/ public void SetTexGen(SceneObjectPart part, int face,int style) { if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted) @@ -2774,7 +2774,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public void llSetRot(LSL_Rotation rot) { m_host.AddScriptLPS(1); - + // try to let this work as in SL... if (m_host.ParentID == 0 || (m_host.ParentGroup != null && m_host == m_host.ParentGroup.RootPart)) { @@ -2960,7 +2960,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api m_host.AddScriptLPS(1); m_host.SetVelocity(new Vector3((float)vel.x, (float)vel.y, (float)vel.z), local != 0); } - + public void llSetAngularVelocity(LSL_Vector avel, int local) { m_host.AddScriptLPS(1); @@ -3129,7 +3129,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { m_SoundModule.SendSound( m_host.UUID, - ScriptUtils.GetAssetIdFromKeyOrItemName(m_host, sound, AssetType.Sound), + ScriptUtils.GetAssetIdFromKeyOrItemName(m_host, sound, AssetType.Sound), volume, false, 0, 0, false, false); } @@ -3602,7 +3602,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api // LSL_Vector up = new LSL_Vector(0.0, 0.0, 1.0); // find normalized left axis parallel to horizon // LSL_Vector left = llVecNorm(LSL_Vector.Cross(up, dir)); - + LSL_Vector left = new LSL_Vector(-dir.y, dir.x, 0.0f); left = llVecNorm(left); // make up orthogonal to left and dir @@ -3851,7 +3851,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api ScriptSleep(2000); return; } - + // We may be able to use ClientView.SendInstantMessage here, but we need a client instance. // 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. @@ -3864,7 +3864,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api UUID friendTransactionID = UUID.Random(); //m_pendingFriendRequests.Add(friendTransactionID, fromAgentID); - + GridInstantMessage msg = new GridInstantMessage(); msg.fromAgentID = new Guid(m_host.OwnerID.ToString()); // fromAgentID.Guid; msg.toAgentID = new Guid(user); // toAgentID.Guid; @@ -4217,7 +4217,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api } ScenePresence presence = World.GetScenePresence(agentID); - + if (presence != null) { // If permissions are being requested from an NPC and were not implicitly granted above then @@ -4285,7 +4285,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api m_host.TaskInventory.LockItemsForWrite(true); m_host.TaskInventory[m_item.ItemID].PermsMask = answer; m_host.TaskInventory.LockItemsForWrite(false); - + m_ScriptEngine.PostScriptEvent(m_item.ItemID, new EventParams( "run_time_permissions", new Object[] { new LSL_Integer(answer) }, @@ -4363,7 +4363,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api UUID targetID; if (!UUID.TryParse(target, out targetID)) - return; + return; SceneObjectPart targetPart = World.GetSceneObjectPart((UUID)targetID); if (targetPart == null) @@ -4493,7 +4493,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api } } finally { } - + newRoot.ParentGroup.HasGroupChanged = true; newRoot.ParentGroup.ScheduleGroupForFullUpdate(); } @@ -4515,7 +4515,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api m_host.AddScriptLPS(1); TaskInventoryItem item = m_item; - + if ((item.PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0 && !m_automaticLinkPermission) { @@ -4634,7 +4634,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api count = count + 1; } } - + m_host.TaskInventory.LockItemsForRead(false); return count; } @@ -4729,7 +4729,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api if (agentItem == null) { - llSay(0, message); + llSay(0, message); return; } @@ -4758,7 +4758,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api if (m_TransferModule != null) m_TransferModule.SendInstantMessage(msg, delegate(bool success) {}); } - + //This delay should only occur when giving inventory to avatars. ScriptSleep(m_sleepMsOnGiveInventory); } @@ -5064,7 +5064,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api // Can't TP sitting avatars if (presence.ParentID != 0) // Sitting return; - + if (m_item.PermsGranter == agentId) { // If attached using llAttachToAvatarTemp, cowardly refuse @@ -5190,7 +5190,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api string movementAnimation = presence.Animator.CurrentMovementAnimation; string lslMovementAnimation; - + if (MovementAnimationsForLSL.TryGetValue(movementAnimation, out lslMovementAnimation)) return lslMovementAnimation; } @@ -5531,7 +5531,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api rot.Normalize(); double angle = 2 * Math.Acos(rot.s); - if (angle > Math.PI) + if (angle > Math.PI) angle = 2 * Math.PI - angle; return angle; @@ -6916,10 +6916,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api SceneObjectPart part = World.GetSceneObjectPart(uuid); if (part != null) { - + if(part.ParentGroup.IsAttachment) { - uuid = part.ParentGroup.AttachedAvatar; + uuid = part.ParentGroup.AttachedAvatar; } else { @@ -10266,7 +10266,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api } break; - case ScriptBaseClass.PRIM_ROTATION: + case ScriptBaseClass.PRIM_ROTATION: if (remain < 1) return new LSL_List(); @@ -10329,7 +10329,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api catch (InvalidCastException e) { Error( - originFunc, + originFunc, string.Format("Error running rule #{0}: arg #{1} - ", rulesParsed, idx - idxStart) + e.Message); } @@ -10433,7 +10433,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api } while (str2.EndsWith("=")) str2 = str2.Substring(0, str2.Length - 1); - + byte[] d1 = new byte[str1.Length]; byte[] d2 = new byte[str2.Length]; @@ -10638,7 +10638,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api Vector3 box = presence.Appearance.AvatarBoxSize * 0.5f; - if (presence.Animator.Animations.ImplicitDefaultAnimation.AnimID + if (presence.Animator.Animations.ImplicitDefaultAnimation.AnimID == DefaultAvatarAnimations.AnimsUUID["SIT_GROUND_CONSTRAINED"]) /* { @@ -10803,7 +10803,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api List parts; List avatars; - + LSL_List res = new LSL_List(); LSL_List remaining = new LSL_List(); @@ -12887,7 +12887,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api return; } } - + ScenePresence avatar = World.GetScenePresence(detectedParams.Key); if (avatar != null) { @@ -13239,7 +13239,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api byte[] d2 = new Byte[data1.Length]; int pos = 0; - + if (data1.Length <= data2.Length) { Array.Copy(data2, 0, d2, 0, data1.Length); @@ -13636,7 +13636,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api LSL_List ret = new LSL_List(); UUID key = new UUID(); - + if (UUID.TryParse(id, out key)) { @@ -13824,7 +13824,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api case ScriptBaseClass.OBJECT_NAME: ret.Add(new LSL_String(obj.Name)); break; - case ScriptBaseClass.OBJECT_DESC: + case ScriptBaseClass.OBJECT_DESC: ret.Add(new LSL_String(obj.Description)); break; case ScriptBaseClass.OBJECT_POS: @@ -13865,7 +13865,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api } else { - vel = obj.Velocity; + vel = obj.Velocity; } ret.Add(vel); @@ -14263,8 +14263,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api ossl.CheckThreatLevel(ThreatLevel.High, "print"); m_log.Info("LSL print():" + str); } - } - + } + public LSL_Integer llGetLinkNumberOfSides(LSL_Integer link) { List parts = GetLinkParts(link); @@ -14488,7 +14488,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { // get work copies float sx = rayStart.X; - float ex = rayEnd.X; + float ex = rayEnd.X; float sy = rayStart.Y; float ey = rayEnd.Y; @@ -14497,7 +14497,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api // region size info float rsx = World.RegionInfo.RegionSizeX; - + float tmp; // region bounds @@ -14513,7 +14513,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api sy += dy * dx; sx = 0; } - else if(sx >= rsx) + else if(sx >= rsx) { if(ex >= rsx) // totally outside return null; @@ -14537,7 +14537,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api sx += dy * dx; sy = 0; } - else if(sy >= rsy) + else if(sy >= rsy) { if(dy >= 0) // out and going away return null; @@ -14875,7 +14875,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { return a.Depth.CompareTo(b.Depth); }); - + int values = 0; SceneObjectGroup thisgrp = m_host.ParentGroup; @@ -14931,7 +14931,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api list.Add(new LSL_Integer(values)); return list; } - + /// /// Implementation of llCastRay similar to SL 2015-04-21. @@ -15076,7 +15076,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api isNonphysical = !isPhysical; isPhantom = ((part.Flags & PrimFlags.Phantom) != 0) || (part.VolumeDetectActive); - + if (isPhysical && rejectPhysical) continue; if (isNonphysical && rejectNonphysical) @@ -16291,7 +16291,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api pos = sitroot.AbsolutePosition + pos * sitroot.GetWorldRotation(); } else - pos = avatar.AbsolutePosition; + pos = avatar.AbsolutePosition; res.Add(new LSL_Vector(pos.X,pos.Y,pos.Z)); break; @@ -16471,7 +16471,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api res.Add(new LSL_String("")); break; - case (int)ScriptBaseClass.PRIM_ROT_LOCAL: + case (int)ScriptBaseClass.PRIM_ROT_LOCAL: Quaternion lrot = avatar.Rotation; res.Add(new LSL_Rotation(lrot.X, lrot.Y, lrot.Z, lrot.W)); break; @@ -16577,7 +16577,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api presence.SetAnimationOverride("ALL", UUID.Zero); return; } - + string state = String.Empty; foreach (KeyValuePair kvp in MovementAnimationsForLSL) diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs index 8cd065b..cec595d 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs @@ -831,6 +831,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api } return success; - } + } } } diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs index 1e26036..692bec0 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs @@ -107,14 +107,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api /// Dumps an error message on the debug console. /// /// - internal void MODShoutError(string message) + internal void MODShoutError(string message) { if (message.Length > 1023) message = message.Substring(0, 1023); World.SimChat( Utils.StringToBytes(message), - ChatTypeEnum.Shout, ScriptBaseClass.DEBUG_CHANNEL, + ChatTypeEnum.Shout, ScriptBaseClass.DEBUG_CHANNEL, m_host.ParentGroup.RootPart.AbsolutePosition, m_host.Name, m_host.UUID, false); IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface(); @@ -122,7 +122,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api } /// - /// + /// /// /// The name of the function to invoke /// List of parameters @@ -130,9 +130,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public void modInvokeN(string fname, params object[] parms) { // m_log.DebugFormat( -// "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type", -// fname, -// string.Join(",", Array.ConvertAll(parms, o => o.ToString())), +// "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type", +// fname, +// string.Join(",", Array.ConvertAll(parms, o => o.ToString())), // ((MethodInfo)MethodBase.GetCurrentMethod()).ReturnType); Type returntype = m_comms.LookupReturnType(fname); @@ -145,9 +145,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public LSL_String modInvokeS(string fname, params object[] parms) { // m_log.DebugFormat( -// "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type", -// fname, -// string.Join(",", Array.ConvertAll(parms, o => o.ToString())), +// "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type", +// fname, +// string.Join(",", Array.ConvertAll(parms, o => o.ToString())), // ((MethodInfo)MethodBase.GetCurrentMethod()).ReturnType); Type returntype = m_comms.LookupReturnType(fname); @@ -161,9 +161,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public LSL_Integer modInvokeI(string fname, params object[] parms) { // m_log.DebugFormat( -// "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type", -// fname, -// string.Join(",", Array.ConvertAll(parms, o => o.ToString())), +// "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type", +// fname, +// string.Join(",", Array.ConvertAll(parms, o => o.ToString())), // ((MethodInfo)MethodBase.GetCurrentMethod()).ReturnType); Type returntype = m_comms.LookupReturnType(fname); @@ -173,13 +173,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api int result = (int)modInvoke(fname,parms); return new LSL_Integer(result); } - + public LSL_Float modInvokeF(string fname, params object[] parms) { // m_log.DebugFormat( -// "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type", -// fname, -// string.Join(",", Array.ConvertAll(parms, o => o.ToString())), +// "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type", +// fname, +// string.Join(",", Array.ConvertAll(parms, o => o.ToString())), // ((MethodInfo)MethodBase.GetCurrentMethod()).ReturnType); Type returntype = m_comms.LookupReturnType(fname); @@ -193,9 +193,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public LSL_Key modInvokeK(string fname, params object[] parms) { // m_log.DebugFormat( -// "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type", -// fname, -// string.Join(",", Array.ConvertAll(parms, o => o.ToString())), +// "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type", +// fname, +// string.Join(",", Array.ConvertAll(parms, o => o.ToString())), // ((MethodInfo)MethodBase.GetCurrentMethod()).ReturnType); Type returntype = m_comms.LookupReturnType(fname); @@ -209,9 +209,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public LSL_Vector modInvokeV(string fname, params object[] parms) { // m_log.DebugFormat( -// "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type", -// fname, -// string.Join(",", Array.ConvertAll(parms, o => o.ToString())), +// "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type", +// fname, +// string.Join(",", Array.ConvertAll(parms, o => o.ToString())), // ((MethodInfo)MethodBase.GetCurrentMethod()).ReturnType); Type returntype = m_comms.LookupReturnType(fname); @@ -225,9 +225,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public LSL_Rotation modInvokeR(string fname, params object[] parms) { // m_log.DebugFormat( -// "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type", -// fname, -// string.Join(",", Array.ConvertAll(parms, o => o.ToString())), +// "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type", +// fname, +// string.Join(",", Array.ConvertAll(parms, o => o.ToString())), // ((MethodInfo)MethodBase.GetCurrentMethod()).ReturnType); Type returntype = m_comms.LookupReturnType(fname); @@ -241,9 +241,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public LSL_List modInvokeL(string fname, params object[] parms) { // m_log.DebugFormat( -// "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type", -// fname, -// string.Join(",", Array.ConvertAll(parms, o => o.ToString())), +// "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type", +// fname, +// string.Join(",", Array.ConvertAll(parms, o => o.ToString())), // ((MethodInfo)MethodBase.GetCurrentMethod()).ReturnType); Type returntype = m_comms.LookupReturnType(fname); @@ -308,22 +308,22 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api } // m_log.DebugFormat( -// "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type", -// fname, -// string.Join(",", Array.ConvertAll(parms, o => o.ToString())), +// "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type", +// fname, +// string.Join(",", Array.ConvertAll(parms, o => o.ToString())), // ((MethodInfo)MethodBase.GetCurrentMethod()).ReturnType); Type[] signature = m_comms.LookupTypeSignature(fname); if (signature.Length != parms.Length) MODError(String.Format("wrong number of parameters to function {0}",fname)); - + object[] convertedParms = new object[parms.Length]; for (int i = 0; i < parms.Length; i++) convertedParms[i] = ConvertFromLSL(parms[i], signature[i], fname); // now call the function, the contract with the function is that it will always return // non-null but don't trust it completely - try + try { object result = m_comms.InvokeOperation(m_host.UUID, m_item.ItemID, fname, convertedParms); if (result != null) @@ -342,7 +342,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api return null; } - + /// /// Send a command to functions registered on an event /// @@ -365,7 +365,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api /// protected object ConvertFromLSL(object lslparm, Type type, string fname) { - + if(lslparm.GetType() == type) return lslparm; @@ -429,7 +429,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api for (int i = 0; i < plist.Length; i++) { if (plist[i] is LSL_String) - result[i] = (string)(LSL_String)plist[i]; + result[i] = (string)(LSL_String)plist[i]; else if (plist[i] is LSL_Integer) result[i] = (int)(LSL_Integer)plist[i]; // The int check exists because of the many plain old int script constants in ScriptBase which @@ -451,7 +451,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api return result; } } - + MODError(String.Format("{0}: parameter type mismatch; expecting {1}, type(parm)={2}", fname, type.Name, lslparm.GetType())); return null; } diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index ba5a46d..066f6a4 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs @@ -142,7 +142,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api internal float m_ScriptDelayFactor = 1.0f; internal float m_ScriptDistanceFactor = 1.0f; internal bool m_debuggerSafe = false; - internal Dictionary m_FunctionPerms = new Dictionary(); + internal Dictionary m_FunctionPerms = new Dictionary(); protected IUrlModule m_UrlModule = null; public void Initialize( @@ -418,7 +418,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api //Only gods may use the function if (m_FunctionPerms[function].AllowedOwnerClasses.Contains("GOD")) { - if (World.Permissions.IsGod(ownerID)) + if (World.Permissions.IsGod(ownerID)) { return String.Empty; } @@ -427,7 +427,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api //Only grid gods may use the function if (m_FunctionPerms[function].AllowedOwnerClasses.Contains("GRID_GOD")) { - if (World.Permissions.IsGridGod(ownerID)) + if (World.Permissions.IsGridGod(ownerID)) { return String.Empty; } @@ -856,11 +856,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api // { // We will launch the teleport on a new thread so that when the script threads are terminated - // before teleport in ScriptInstance.GetXMLState(), we don't end up aborting the one doing the teleporting. + // before teleport in ScriptInstance.GetXMLState(), we don't end up aborting the one doing the teleporting. Util.FireAndForget( o => World.RequestTeleportLocation( presence.ControllingClient, regionName, position, - lookat, (uint)TPFlags.ViaLocation), + lookat, (uint)TPFlags.ViaLocation), null, "OSSL_Api.TeleportAgentByRegionCoords"); ScriptSleep(5000); @@ -906,8 +906,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api // before teleport in ScriptInstance.GetXMLState(), we don't end up aborting the one doing the teleporting. Util.FireAndForget( o => World.RequestTeleportLocation( - presence.ControllingClient, regionHandle, - position, lookat, (uint)TPFlags.ViaLocation), + presence.ControllingClient, regionHandle, + position, lookat, (uint)TPFlags.ViaLocation), null, "OSSL_Api.TeleportAgentByRegionName"); ScriptSleep(5000); @@ -972,13 +972,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api m_host.AddScriptLPS(1); UUID targetID = new UUID(target); - - ForceSit(avatar, targetID); + + ForceSit(avatar, targetID); } public void ForceSit(string avatar, UUID targetID) { - UUID agentID; + UUID agentID; if (!UUID.TryParse(avatar, out agentID)) return; @@ -1015,7 +1015,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api ScenePresence target = (ScenePresence)World.Entities[avatarID]; return target.ControllingClient.RemoteEndPoint.Address.ToString(); } - + // fall through case, just return nothing return ""; } @@ -1058,7 +1058,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api ScenePresence target = null; if ((World.Entities[avatarID] is ScenePresence)) target = (ScenePresence)World.Entities[avatarID]; - + if (target == null) return; @@ -1115,8 +1115,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api else animID = UUID.Zero; } - - + + if (animID == UUID.Zero) target.Animator.RemoveAnimation(animation); else @@ -1257,7 +1257,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public string osSetPenColor(string drawList, string color) { CheckThreatLevel(ThreatLevel.None, "osSetPenColor"); - + m_host.AddScriptLPS(1); drawList += "PenColor " + color + "; "; return drawList; @@ -1780,7 +1780,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api } return result; } - + private ArrayList osdToArray(OSDArray list) { ArrayList result = new ArrayList(); @@ -1834,7 +1834,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api m_host.AddScriptLPS(1); Object decoded = osParseJSONNew(JSON); - + if ( decoded is Hashtable ) { return (Hashtable) decoded; } else if ( decoded is ArrayList ) { @@ -1902,7 +1902,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { // CheckThreatLevel(ThreatLevel.VeryHigh, "osDie"); // if this is restricted to objects rezzed by this host level can be reduced - + CheckThreatLevel(ThreatLevel.Low, "osDie"); m_host.AddScriptLPS(1); @@ -1931,7 +1931,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api if (sceneOG.OwnerID != m_host.OwnerID) return; - + // harakiri check if(sceneOG.UUID == m_host.ParentGroup.UUID) throw new SelfDeleteException(); @@ -2042,16 +2042,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api if (assetID != UUID.Zero) { StringBuilder notecardData = new StringBuilder(); - + for (int count = 0; count < NotecardCache.GetLines(assetID); count++) { string line = NotecardCache.GetLine(assetID, count) + "\n"; - + // m_log.DebugFormat("[OSSL]: From notecard {0} loading line {1}", notecardNameOrUuid, line); - + notecardData.Append(line); } - + return notecardData.ToString(); } @@ -2086,7 +2086,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api if (a == null) { - // Whoops, it's still possible here that the notecard name was properly + // Whoops, it's still possible here that the notecard name was properly // formatted like a UUID but isn't an asset UUID so lets look it up by name after all assetID = SearchTaskInventoryForAssetId(notecardNameOrUuid); if (assetID == UUID.Zero) @@ -2291,7 +2291,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api } } } - + return ""; } @@ -2429,7 +2429,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api m_host.AddScriptLPS(1); IConfigSource config = m_ScriptEngine.ConfigSource; - string HomeURI = Util.GetConfigVarFromSections(config, "HomeURI", + string HomeURI = Util.GetConfigVarFromSections(config, "HomeURI", new string[] { "Startup", "Hypergrid" }, String.Empty); if (!string.IsNullOrEmpty(HomeURI)) @@ -2705,12 +2705,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { CheckThreatLevel(ThreatLevel.High, "osNpcCreate"); m_host.AddScriptLPS(1); - + // have to get the npc module also here to set the default Not Owned INPCModule module = World.RequestModuleInterface(); if(module == null) return new LSL_Key(UUID.Zero.ToString()); - + bool owned = (module.NPCOptionFlags & NPCOptionsFlags.AllowNotOwned) == 0; return NpcCreate(firstname, lastname, position, notecard, owned, false, false); @@ -2795,7 +2795,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api groupTitle = "- NPC -"; } } - + if((createFlags & NPCOptionsFlags.AllowCloneOtherAvatars) != 0) { UUID id; @@ -2973,7 +2973,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api if (!module.CheckPermissions(npcId, m_host.OwnerID)) return; - + module.MoveToTarget(npcId, World, pos, false, true, false); } } @@ -3202,7 +3202,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api if (!module.CheckPermissions(npcId, m_host.OwnerID)) return; - module.DeleteNPC(npcId, World); + module.DeleteNPC(npcId, World); } } catch { } @@ -3259,7 +3259,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { CheckThreatLevel(ThreatLevel.High, "osNpcTouch"); m_host.AddScriptLPS(1); - + INPCModule module = World.RequestModuleInterface(); int linkNum = link_num.value; if (module != null || (linkNum < 0 && linkNum != ScriptBaseClass.LINK_THIS)) @@ -3400,7 +3400,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api bool isMale = vpShapeMale > 0.5f; return new LSL_String(isMale ? "male" : "female"); } - + /// /// Get current region's map texture UUID /// @@ -3441,7 +3441,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api return key.ToString(); } - + /// /// Return information regarding various simulator statistics (sim fps, physics fps, time /// dilation, total number of prims, total number of active scripts, script lps, various @@ -3455,7 +3455,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api m_host.AddScriptLPS(1); LSL_List ret = new LSL_List(); float[] stats = World.StatsReporter.LastReportedSimStats; - + for (int i = 0; i < 21; i++) { ret.Add(new LSL_Float(stats[i])); @@ -3488,7 +3488,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api return (int)pws; } - + public void osSetSpeed(string UUID, LSL_Float SpeedModifier) { CheckThreatLevel(ThreatLevel.Moderate, "osSetSpeed"); @@ -3498,7 +3498,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api if (avatar != null) avatar.SpeedModifier = (float)SpeedModifier; } - + public void osKickAvatar(string FirstName, string SurName, string alert) { CheckThreatLevel(ThreatLevel.Severe, "osKickAvatar"); @@ -3528,7 +3528,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api if (presence != null) health = presence.Health; return health; } - + public void osCauseDamage(string avatar, double damage) { CheckThreatLevel(ThreatLevel.High, "osCauseDamage"); @@ -3537,7 +3537,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api UUID avatarId = new UUID(avatar); Vector3 pos = m_host.GetWorldPosition(); - ScenePresence presence = World.GetScenePresence(avatarId); + ScenePresence presence = World.GetScenePresence(avatarId); if (presence != null) { LandData land = World.GetLandData(pos); @@ -3556,7 +3556,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api } } } - + public void osCauseHealing(string avatar, double healing) { CheckThreatLevel(ThreatLevel.High, "osCauseHealing"); @@ -3625,7 +3625,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api CheckThreatLevel(ThreatLevel.High, "osGetPrimitiveParams"); m_host.AddScriptLPS(1); InitLSL(); - + return m_LSL_Api.GetPrimitiveParamsEx(prim, rules); } @@ -3634,12 +3634,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api CheckThreatLevel(ThreatLevel.High, "osSetPrimitiveParams"); m_host.AddScriptLPS(1); InitLSL(); - + m_LSL_Api.SetPrimitiveParamsEx(prim, rules, "osSetPrimitiveParams"); } - + /// - /// Set parameters for light projection in host prim + /// Set parameters for light projection in host prim /// public void osSetProjectionParams(bool projection, LSL_Key texture, double fov, double focus, double amb) { @@ -3723,7 +3723,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api /// Get the description from an inventory item /// /// - /// Item description + /// Item description public LSL_String osGetInventoryDesc(string item) { m_host.AddScriptLPS(1); @@ -3921,7 +3921,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api if (item.InvType != (int)InventoryType.Object) { // FIXME: Temporary null check for regression tests since they dont' have the infrastructure to set - // up the api reference. + // up the api reference. if (m_LSL_Api != null) ((LSL_Api)m_LSL_Api).llSay(0, string.Format("Unable to attach, item '{0}' is not an object.", itemName)); @@ -4002,10 +4002,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api UUID targetUUID; if(!UUID.TryParse(avatar.ToString(), out targetUUID)) return; - + if(targetUUID == UUID.Zero) return; - + ScenePresence target; if(!World.TryGetScenePresence(targetUUID, out target)) return; @@ -4068,7 +4068,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api return; } - bool optionObjCreator = (options & + bool optionObjCreator = (options & ScriptBaseClass.OS_ATTACH_MSG_OBJECT_CREATOR) != 0; bool optionScriptCreator = (options & ScriptBaseClass.OS_ATTACH_MSG_SCRIPT_CREATOR) != 0; @@ -4316,7 +4316,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { CheckThreatLevel(ThreatLevel.Moderate, "osRequestSecureURL"); m_host.AddScriptLPS(1); - + Hashtable opts = new Hashtable(); for (int i = 0 ; i < options.Length ; i++) { @@ -4334,7 +4334,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { CheckThreatLevel(ThreatLevel.Moderate, "osRequestSecureURL"); m_host.AddScriptLPS(1); - + Hashtable opts = new Hashtable(); for (int i = 0 ; i < options.Length ; i++) { @@ -4362,7 +4362,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api m_host.CollisionSoundType = 0; // full return to default sounds else m_host.CollisionSoundType = 2; // default sounds with volume - m_host.aggregateScriptEvents(); + m_host.aggregateScriptEvents(); return; } // TODO: Parameter check logic required. @@ -4376,7 +4376,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api else m_host.CollisionSoundType = -1; - m_host.aggregateScriptEvents(); + m_host.aggregateScriptEvents(); } // still not very usefull, detector is lost on rez, restarts, etc diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs index 7bfe27b..d401ed8 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs @@ -351,7 +351,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins // your head but the sensor will stay with your (global) // avatar rotation and position. // Position of a sensor in a child prim attached to an avatar - // will be still wrong. + // will be still wrong. ScenePresence avatar = m_CmdManager.m_ScriptEngine.World.GetScenePresence(SensePoint.ParentGroup.AttachedAvatar); // Don't proceed if the avatar for this attachment has since been removed from the scene. @@ -473,7 +473,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins SceneObjectPart SensePoint = ts.host; Vector3 fromRegionPos = SensePoint.GetWorldPosition(); - + Quaternion q = SensePoint.GetWorldRotation(); if (SensePoint.ParentGroup.IsAttachment) { @@ -486,7 +486,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins // your head but the sensor will stay with your (global) // avatar rotation and position. // Position of a sensor in a child prim attached to an avatar - // will be still wrong. + // will be still wrong. ScenePresence avatar = m_CmdManager.m_ScriptEngine.World.GetScenePresence(SensePoint.ParentGroup.AttachedAvatar); // Don't proceed if the avatar for this attachment has since been removed from the scene. @@ -502,7 +502,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins bool attached = (SensePoint.ParentGroup.AttachmentPoint != 0); Vector3 toRegionPos; double dis; - + Action senseEntity = new Action(presence => { // m_log.DebugFormat( @@ -542,7 +542,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins if (presence.IsDeleted || presence.IsChildAgent || presence.GodLevel > 0.0) return; - + // if the object the script is in is attached and the avatar is the owner // then this one is not wanted if (attached && presence.UUID == SensePoint.OwnerID) @@ -700,7 +700,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins DateTime.Now.ToUniversalTime().AddSeconds(ts.interval); AddSenseRepeater(ts); - + idx += 6; } } @@ -716,6 +716,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins } return retList; - } + } } } diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs index 5b1fdc0..cae1c14 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs @@ -200,6 +200,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins } return retList; - } + } } } diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Properties/AssemblyInfo.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Properties/AssemblyInfo.cs index 16805e4..e6676b4 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Properties/AssemblyInfo.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Properties/AssemblyInfo.cs @@ -2,7 +2,7 @@ using System.Runtime.CompilerServices; 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. [assembly: AssemblyTitle("OpenSim.Region.ScriptEngine.Shared.Api")] @@ -14,8 +14,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)] @@ -25,7 +25,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/Shared/Api/Interface/IMOD_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IMOD_Api.cs index aa78aaa..7c518f3 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IMOD_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IMOD_Api.cs @@ -49,7 +49,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces LSL_Vector modInvokeV(string fname, params object[] parms); LSL_Rotation modInvokeR(string fname, params object[] parms); LSL_List modInvokeL(string fname, params object[] parms); - + //Module functions string modSendCommand(string modules, string command, string k); } diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs index 7415fea..bee060a 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs @@ -54,7 +54,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces NoAccess = -1, /// - /// Function is no threat at all. It doesn't constitute a threat to + /// Function is no threat at all. It doesn't constitute a threat to /// either users or the system and has no known side effects. /// None = 0, @@ -66,7 +66,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces Nuisance = 1, /// - /// Extreme levels of abuse of this function can cause impaired + /// Extreme levels of abuse of this function can cause impaired /// functioning of the region, or very gullible users can be tricked /// into experiencing harmless effects. /// @@ -81,7 +81,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces /// /// Intentional abuse can cause denial of service and crashes with - /// potential of data or state loss; or trusting users can be tricked + /// potential of data or state loss; or trusting users can be tricked /// into embarrassing or uncomfortable situations. /// Moderate = 4, @@ -145,7 +145,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces // Avatar Info Commands string osGetAgentIP(string agent); LSL_List osGetAgents(); - + // Teleport commands void osTeleportAgent(string agent, string regionName, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat); void osTeleportAgent(string agent, int regionX, int regionY, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat); diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs index 903b362..3a90c77 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs @@ -746,7 +746,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase public const int FRICTION = 2; public const int RESTITUTION = 4; public const int GRAVITY_MULTIPLIER = 8; - + // extra constants for llSetPrimMediaParams public static readonly LSLInteger LSL_STATUS_OK = new LSLInteger(0); public static readonly LSLInteger LSL_STATUS_MALFORMED_PARAMS = new LSLInteger(1000); diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs index 9d36341..1a42c3a 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs @@ -1580,7 +1580,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase m_LSL_Functions.llSetVelocity(force, local); } - + public void llSetAngularVelocity(LSL_Vector force, int local) { m_LSL_Functions.llSetAngularVelocity(force, local); @@ -1995,7 +1995,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase { return m_LSL_Functions.llXorBase64StringsCorrect(str1, str2); } - + public LSL_List llGetPrimMediaParams(int face, LSL_List rules) { return m_LSL_Functions.llGetPrimMediaParams(face, rules); diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs index c34ccd0..6164734 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs @@ -539,7 +539,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase { return m_OSSL_Functions.osReplaceString(src,pattern,replace,count,start); } - + // Information about data loaded into the region public string osLoadedCreationDate() @@ -914,7 +914,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase { return m_OSSL_Functions.osGetRegionMapTexture(regionName); } - + public LSL_List osGetRegionStats() { return m_OSSL_Functions.osGetRegionStats(); @@ -934,12 +934,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase { return m_OSSL_Functions.osGetSimulatorMemory(); } - + public void osKickAvatar(string FirstName,string SurName,string alert) { m_OSSL_Functions.osKickAvatar(FirstName, SurName, alert); } - + public void osSetSpeed(string UUID, LSL_Float SpeedModifier) { m_OSSL_Functions.osSetSpeed(UUID, SpeedModifier); @@ -954,7 +954,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase { m_OSSL_Functions.osCauseDamage(avatar, damage); } - + public void osCauseHealing(string avatar, double healing) { m_OSSL_Functions.osCauseHealing(avatar, healing); @@ -984,12 +984,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase { m_OSSL_Functions.osForceOtherSit(avatar, target); } - + public LSL_List osGetPrimitiveParams(LSL_Key prim, LSL_List rules) { return m_OSSL_Functions.osGetPrimitiveParams(prim, rules); } - + public void osSetPrimitiveParams(LSL_Key prim, LSL_List rules) { m_OSSL_Functions.osSetPrimitiveParams(prim, rules); diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Properties/AssemblyInfo.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Properties/AssemblyInfo.cs index b1825ac..81020f1 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Properties/AssemblyInfo.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Properties/AssemblyInfo.cs @@ -2,7 +2,7 @@ using System.Runtime.CompilerServices; 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. [assembly: AssemblyTitle("OpenSim.Region.ScriptEngine.Shared.Api.Runtime")] @@ -14,8 +14,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)] @@ -25,7 +25,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 // -- cgit v1.1