diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestTestServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestTestServices.cs index 270a8c79df..41319eae8e 100644 --- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestTestServices.cs +++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestTestServices.cs @@ -212,7 +212,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory /// private void loadTests() { - lock(tests) + lock (tests) { if (!testsLoaded) { diff --git a/OpenSim/Data/MySQL/MySQLDataStore.cs b/OpenSim/Data/MySQL/MySQLDataStore.cs index 07f4c10c00..70b6d3c805 100644 --- a/OpenSim/Data/MySQL/MySQLDataStore.cs +++ b/OpenSim/Data/MySQL/MySQLDataStore.cs @@ -744,9 +744,9 @@ namespace OpenSim.Data.MySQL DataRow row = rawsettings[0]; RegionSettings newSettings = buildRegionSettings(row); - newSettings.OnSave += StoreRegionSettings; + newSettings.OnSave += StoreRegionSettings; - return newSettings; + return newSettings; } } diff --git a/OpenSim/Data/MySQL/MySQLEstateData.cs b/OpenSim/Data/MySQL/MySQLEstateData.cs index e843457859..8991e02a70 100644 --- a/OpenSim/Data/MySQL/MySQLEstateData.cs +++ b/OpenSim/Data/MySQL/MySQLEstateData.cs @@ -185,7 +185,7 @@ namespace OpenSim.Data.MySQL else m_FieldMap[name].SetValue(es, false); } - else if(m_FieldMap[name].GetValue(es) is libsecondlife.LLUUID) + else if (m_FieldMap[name].GetValue(es) is libsecondlife.LLUUID) { LLUUID uuid = LLUUID.Zero; diff --git a/OpenSim/Data/SQLite/SQLiteEstateData.cs b/OpenSim/Data/SQLite/SQLiteEstateData.cs index 092f4d5b2a..dc5ba5ef25 100644 --- a/OpenSim/Data/SQLite/SQLiteEstateData.cs +++ b/OpenSim/Data/SQLite/SQLiteEstateData.cs @@ -109,7 +109,7 @@ namespace OpenSim.Data.SQLite else m_FieldMap[name].SetValue(es, false); } - else if(m_FieldMap[name].GetValue(es) is libsecondlife.LLUUID) + else if (m_FieldMap[name].GetValue(es) is libsecondlife.LLUUID) { LLUUID uuid = LLUUID.Zero; diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 8d50c3015b..d7f0ed4e78 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs @@ -318,7 +318,7 @@ namespace OpenSim.Framework ulong ActiveGroupPowers { get; } - ulong GetGroupPowers(LLUUID groupID); + ulong GetGroupPowers(LLUUID groupID); string FirstName { get; } diff --git a/OpenSim/Region/ClientStack/FunSLUDP/LLClientView.cs b/OpenSim/Region/ClientStack/FunSLUDP/LLClientView.cs index a984173d97..1e73152c2f 100644 --- a/OpenSim/Region/ClientStack/FunSLUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/FunSLUDP/LLClientView.cs @@ -115,7 +115,7 @@ namespace OpenSim.Region.ClientStack.FunSLUDP protected LLUUID m_activeGroupID = LLUUID.Zero; protected string m_activeGroupName = String.Empty; protected ulong m_activeGroupPowers = 0; - protected Dictionary m_groupPowers = new Dictionary(); + protected Dictionary m_groupPowers = new Dictionary(); /* Instantiated Designated Event Delegates */ //- used so we don't create new objects for each incoming packet and then toss it out later */ @@ -293,12 +293,12 @@ namespace OpenSim.Region.ClientStack.FunSLUDP get { return m_activeGroupPowers; } } - public ulong GetGroupPowers(LLUUID groupID) - { - if(m_groupPowers.ContainsKey(groupID)) - return m_groupPowers[groupID]; - return 0; - } + public ulong GetGroupPowers(LLUUID groupID) + { + if (m_groupPowers.ContainsKey(groupID)) + return m_groupPowers[groupID]; + return 0; + } /// /// This is a utility method used by single states to not duplicate kicks and blue card of death messages. @@ -6291,7 +6291,7 @@ namespace OpenSim.Region.ClientStack.FunSLUDP packet.ObjectData.ObjectID = objectID; SetFollowCamPropertiesPacket.CameraPropertyBlock[] camPropBlock = new SetFollowCamPropertiesPacket.CameraPropertyBlock[parameters.Count]; uint idx = 0; - foreach(KeyValuePair pair in parameters) + foreach (KeyValuePair pair in parameters) { SetFollowCamPropertiesPacket.CameraPropertyBlock block = new SetFollowCamPropertiesPacket.CameraPropertyBlock(); block.Type = pair.Key; diff --git a/OpenSim/Region/ClientStack/FunSLUDP/LLPacketHandler.cs b/OpenSim/Region/ClientStack/FunSLUDP/LLPacketHandler.cs index 3a0d937459..342dd5c147 100644 --- a/OpenSim/Region/ClientStack/FunSLUDP/LLPacketHandler.cs +++ b/OpenSim/Region/ClientStack/FunSLUDP/LLPacketHandler.cs @@ -248,12 +248,12 @@ namespace OpenSim.Region.ClientStack.FunSLUDP private void AddAcks(ref Packet packet) { - // This packet type has shown to have issues with - // acks being appended to the payload, just don't send - // any with this packet type until libsl is fixed. - // - if(packet is libsecondlife.Packets.ViewerEffectPacket) - return; + // This packet type has shown to have issues with + // acks being appended to the payload, just don't send + // any with this packet type until libsl is fixed. + // + if (packet is libsecondlife.Packets.ViewerEffectPacket) + return; // Add acks to outgoing packets // diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 93cb8900a9..ec945cd55a 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs @@ -115,7 +115,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP protected LLUUID m_activeGroupID = LLUUID.Zero; protected string m_activeGroupName = String.Empty; protected ulong m_activeGroupPowers = 0; - protected Dictionary m_groupPowers = new Dictionary(); + protected Dictionary m_groupPowers = new Dictionary(); /* Instantiated Designated Event Delegates */ //- used so we don't create new objects for each incoming packet and then toss it out later */ @@ -293,12 +293,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP get { return m_activeGroupPowers; } } - public ulong GetGroupPowers(LLUUID groupID) - { - if(m_groupPowers.ContainsKey(groupID)) - return m_groupPowers[groupID]; - return 0; - } + public ulong GetGroupPowers(LLUUID groupID) + { + if (m_groupPowers.ContainsKey(groupID)) + return m_groupPowers[groupID]; + return 0; + } /// /// This is a utility method used by single states to not duplicate kicks and blue card of death messages. @@ -6292,7 +6292,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP packet.ObjectData.ObjectID = objectID; SetFollowCamPropertiesPacket.CameraPropertyBlock[] camPropBlock = new SetFollowCamPropertiesPacket.CameraPropertyBlock[parameters.Count]; uint idx = 0; - foreach(KeyValuePair pair in parameters) + foreach (KeyValuePair pair in parameters) { SetFollowCamPropertiesPacket.CameraPropertyBlock block = new SetFollowCamPropertiesPacket.CameraPropertyBlock(); block.Type = pair.Key; diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs index e1a96781d3..b035150723 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs @@ -248,12 +248,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void AddAcks(ref Packet packet) { - // This packet type has shown to have issues with - // acks being appended to the payload, just don't send - // any with this packet type until libsl is fixed. - // - if(packet is libsecondlife.Packets.ViewerEffectPacket) - return; + // This packet type has shown to have issues with + // acks being appended to the payload, just don't send + // any with this packet type until libsl is fixed. + // + if (packet is libsecondlife.Packets.ViewerEffectPacket) + return; // Add acks to outgoing packets // diff --git a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs index 6b82994851..1be587a6a3 100644 --- a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs @@ -121,7 +121,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate public void setEstateTerrainBaseTexture(IClientAPI remoteClient, int corner, LLUUID texture) { - if(texture == LLUUID.Zero) + if (texture == LLUUID.Zero) return; switch (corner) @@ -761,10 +761,10 @@ namespace OpenSim.Region.Environment.Modules.World.Estate if (m_scene.RegionInfo.RegionSettings.Sandbox) flags |= Simulator.RegionFlags.Sandbox; - // Fudge these to always on, so the menu options activate - // - flags |= Simulator.RegionFlags.AllowLandmark; - flags |= Simulator.RegionFlags.AllowSetHome; + // Fudge these to always on, so the menu options activate + // + flags |= Simulator.RegionFlags.AllowLandmark; + flags |= Simulator.RegionFlags.AllowSetHome; // TODO: SkipUpdateInterestList diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs index 15a68c135b..305e23632b 100644 --- a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs +++ b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs @@ -166,8 +166,8 @@ namespace OpenSim.Region.Environment.Modules.World.Land if (estateModule != null) regionFlags = estateModule.GetRegionFlags(); - // In a perfect world, this would have worked. - // + // In a perfect world, this would have worked. + // // if ((landData.Flags & (uint)Parcel.ParcelFlags.AllowLandmark) != 0) // regionFlags |= (uint)Simulator.RegionFlags.AllowLandmark; // if (landData.OwnerID == remote_client.AgentId) diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs index 4c28361d98..e286d231cb 100644 --- a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs @@ -365,10 +365,10 @@ namespace OpenSim.Region.Environment.Modules.World.NPC get { return 0; } } - public ulong GetGroupPowers(LLUUID groupID) - { - return 0; - } + public ulong GetGroupPowers(LLUUID groupID) + { + return 0; + } public virtual int NextAnimationSequenceNumber { diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainChannel.cs b/OpenSim/Region/Environment/Modules/World/Terrain/TerrainChannel.cs index 0a1634118a..5c3eb7d0fa 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainChannel.cs +++ b/OpenSim/Region/Environment/Modules/World/Terrain/TerrainChannel.cs @@ -130,7 +130,7 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain set { // Will "fix" terrain hole problems. Although not fantastically. - if(Double.IsNaN(value) || Double.IsInfinity(value)) + if (Double.IsNaN(value) || Double.IsInfinity(value)) return; if (map[x, y] != value) @@ -231,4 +231,4 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain } } } -} \ No newline at end of file +} diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs index 9859dc22e5..2196dccb24 100644 --- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs +++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs @@ -277,10 +277,10 @@ namespace OpenSim.Region.Examples.SimpleModule get { return 0; } } - public ulong GetGroupPowers(LLUUID groupID) - { - return 0; - } + public ulong GetGroupPowers(LLUUID groupID) + { + return 0; + } public virtual int NextAnimationSequenceNumber { diff --git a/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs b/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs index cd2aa45f53..696967b40f 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 30093eb5df..baa781e5bc 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 dabb1289ec..4969df031e 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 401a5eaebf..2a1efd42c6 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); } diff --git a/OpenSim/Tests/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGeneratorTest.cs b/OpenSim/Tests/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGeneratorTest.cs index 427390b150..a6b07bf4c6 100644 --- a/OpenSim/Tests/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGeneratorTest.cs +++ b/OpenSim/Tests/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGeneratorTest.cs @@ -1401,7 +1401,7 @@ default { state_entry() { - while(1<0); + while (1<0); } }"; @@ -1426,7 +1426,7 @@ default state_entry() { do; - while(1<0); + while (1<0); } }"; @@ -1451,7 +1451,7 @@ default { state_entry() { - if(1<0); + if (1<0); } }"; @@ -1475,7 +1475,7 @@ default { state_entry() { - if(1<0); + if (1<0); else; } }"; @@ -1502,7 +1502,7 @@ default { state_entry() { - for(x = 4; 1<0; x += 2); + for (x = 4; 1<0; x += 2); } }"; @@ -1528,13 +1528,13 @@ default { integer x; - while(x = 14) llOwnerSay(""x is: "" + (string) x); + while (x = 14) llOwnerSay(""x is: "" + (string) x); - if(x = 24) llOwnerSay(""x is: "" + (string) x); + if (x = 24) llOwnerSay(""x is: "" + (string) x); do llOwnerSay(""x is: "" + (string) x); - while(x = 44); + while (x = 44); } }";