From 0718aa0b7fd7cb3bb42d36b37f79d8d6cfc725bc Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Thu, 7 Aug 2008 12:55:46 +0000 Subject: Minor formatting cleanup. --- .../Common/BuiltIn_Commands_BaseClass.cs | 2 +- .../ScriptEngine/Common/LSL_BuiltIn_Commands.cs | 20 ++++++++++---------- .../Common/ScriptEngineBase/EventQueueThreadClass.cs | 4 ++-- .../Shared/Api/Implementation/LSL_Api.cs | 20 ++++++++++---------- 4 files changed, 23 insertions(+), 23 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 cd2aa45..696967b 100644 --- a/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs +++ b/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs @@ -2426,7 +2426,7 @@ namespace OpenSim.Region.ScriptEngine.Common public static readonly vector ZERO_VECTOR = new vector(0.0, 0.0, 0.0); public static readonly rotation ZERO_ROTATION = new rotation(0.0, 0, 0.0, 1.0); - // constants for llSetCameraParams + // constants for llSetCameraParams public const int CAMERA_PITCH = 0; public const int CAMERA_FOCUS_OFFSET = 1; public const int CAMERA_FOCUS_OFFSET_X = 2; diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs index 30093eb..baa781e 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs @@ -6924,7 +6924,7 @@ namespace OpenSim.Region.ScriptEngine.Common // the object we are in LLUUID objectID = m_host.ParentUUID; - if(objectID == LLUUID.Zero) return; + if (objectID == LLUUID.Zero) return; // we need the permission first, to know which avatar we want to set the camera for LLUUID agentID = m_host.TaskInventory[invItemID].PermsGranter; @@ -6934,16 +6934,16 @@ namespace OpenSim.Region.ScriptEngine.Common ScenePresence presence = World.GetScenePresence(agentID); // we are not interested in child-agents - if(presence.IsChildAgent) return; + if (presence.IsChildAgent) return; SortedDictionary parameters = new SortedDictionary(); object[] data = rules.Data; - for(int i = 0; i < data.Length; ++i) { + for (int i = 0; i < data.Length; ++i) { int type = Convert.ToInt32(data[i++]); - if(i >= data.Length) break; // odd number of entries => ignore the last + if (i >= data.Length) break; // odd number of entries => ignore the last // some special cases: Vector parameters are split into 3 float parameters (with type+1, type+2, type+3) - switch(type) { + switch (type) { case BuiltIn_Commands_BaseClass.CAMERA_FOCUS: case BuiltIn_Commands_BaseClass.CAMERA_FOCUS_OFFSET: case BuiltIn_Commands_BaseClass.CAMERA_POSITION: @@ -6954,15 +6954,15 @@ namespace OpenSim.Region.ScriptEngine.Common break; default: // TODO: clean that up as soon as the implicit casts are in - if(data[i] is LSL_Types.LSLFloat) + if (data[i] is LSL_Types.LSLFloat) parameters.Add(type, (float)((LSL_Types.LSLFloat)data[i]).value); - else if(data[i] is LSL_Types.LSLInteger) + else if (data[i] is LSL_Types.LSLInteger) parameters.Add(type, (float)((LSL_Types.LSLInteger)data[i]).value); else parameters.Add(type, Convert.ToSingle(data[i])); break; } } - if(parameters.Count > 0) presence.ControllingClient.SendSetFollowCamProperties(objectID, parameters); + if (parameters.Count > 0) presence.ControllingClient.SendSetFollowCamProperties(objectID, parameters); } public void llClearCameraParams() @@ -6975,7 +6975,7 @@ namespace OpenSim.Region.ScriptEngine.Common // the object we are in LLUUID objectID = m_host.ParentUUID; - if(objectID == LLUUID.Zero) return; + if (objectID == LLUUID.Zero) return; // we need the permission first, to know which avatar we want to clear the camera for LLUUID agentID = m_host.TaskInventory[invItemID].PermsGranter; @@ -6985,7 +6985,7 @@ namespace OpenSim.Region.ScriptEngine.Common ScenePresence presence = World.GetScenePresence(agentID); // we are not interested in child-agents - if(presence.IsChildAgent) return; + if (presence.IsChildAgent) return; presence.ControllingClient.SendClearFollowCamProperties(objectID); } diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs index dabb128..4969df0 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs @@ -158,8 +158,8 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase /// private void EventQueueThreadLoop() { - CultureInfo USCulture = new CultureInfo("en-US"); - Thread.CurrentThread.CurrentCulture = USCulture; + CultureInfo USCulture = new CultureInfo("en-US"); + Thread.CurrentThread.CurrentCulture = USCulture; //myScriptEngine.Log.Info("[" + ScriptEngineName + "]: EventQueueManager Worker thread spawned"); try diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 401a5ea..2a1efd4 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs @@ -6702,7 +6702,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api // the object we are in LLUUID objectID = m_host.ParentUUID; - if(objectID == LLUUID.Zero) return; + if (objectID == LLUUID.Zero) return; // we need the permission first, to know which avatar we want to set the camera for LLUUID agentID = m_host.TaskInventory[invItemID].PermsGranter; @@ -6712,16 +6712,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api ScenePresence presence = World.GetScenePresence(agentID); // we are not interested in child-agents - if(presence.IsChildAgent) return; + if (presence.IsChildAgent) return; SortedDictionary parameters = new SortedDictionary(); object[] data = rules.Data; - for(int i = 0; i < data.Length; ++i) { + for (int i = 0; i < data.Length; ++i) { int type = Convert.ToInt32(data[i++]); - if(i >= data.Length) break; // odd number of entries => ignore the last + if (i >= data.Length) break; // odd number of entries => ignore the last // some special cases: Vector parameters are split into 3 float parameters (with type+1, type+2, type+3) - switch(type) { + switch (type) { case ScriptBaseClass.CAMERA_FOCUS: case ScriptBaseClass.CAMERA_FOCUS_OFFSET: case ScriptBaseClass.CAMERA_POSITION: @@ -6732,15 +6732,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api break; default: // TODO: clean that up as soon as the implicit casts are in - if(data[i] is LSL_Types.LSLFloat) + if (data[i] is LSL_Types.LSLFloat) parameters.Add(type, (float)((LSL_Types.LSLFloat)data[i]).value); - else if(data[i] is LSL_Types.LSLInteger) + else if (data[i] is LSL_Types.LSLInteger) parameters.Add(type, (float)((LSL_Types.LSLInteger)data[i]).value); else parameters.Add(type, Convert.ToSingle(data[i])); break; } } - if(parameters.Count > 0) presence.ControllingClient.SendSetFollowCamProperties(objectID, parameters); + if (parameters.Count > 0) presence.ControllingClient.SendSetFollowCamProperties(objectID, parameters); } public void llClearCameraParams() @@ -6753,7 +6753,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api // the object we are in LLUUID objectID = m_host.ParentUUID; - if(objectID == LLUUID.Zero) return; + if (objectID == LLUUID.Zero) return; // we need the permission first, to know which avatar we want to clear the camera for LLUUID agentID = m_host.TaskInventory[invItemID].PermsGranter; @@ -6763,7 +6763,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api ScenePresence presence = World.GetScenePresence(agentID); // we are not interested in child-agents - if(presence.IsChildAgent) return; + if (presence.IsChildAgent) return; presence.ControllingClient.SendClearFollowCamProperties(objectID); } -- cgit v1.1