From cad0aab7934bf0f81634c44fc03876f4b252eaa8 Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Tue, 14 Apr 2009 11:38:33 +0000 Subject: [PATCH] Formatting cleanup. --- OpenSim/Framework/Communications/Cache/AssetCache.cs | 10 +++++----- OpenSim/Region/Framework/Scenes/SceneGraph.cs | 10 +++++----- OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 2 +- .../OptionalModules/Avatar/Chat/IRCBridgeModule.cs | 2 +- .../OptionalModules/Scripting/Minimodule/MRMModule.cs | 4 ++-- .../OptionalModules/Scripting/Minimodule/SOPObject.cs | 2 +- .../Minimodule/Test/DrunkenTextAppreciationModule.cs | 4 ++-- .../OptionalModules/Scripting/Minimodule/World.cs | 2 +- OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | 2 +- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs index 4d2db1799d..f8b57570c5 100644 --- a/OpenSim/Framework/Communications/Cache/AssetCache.cs +++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs @@ -393,9 +393,9 @@ namespace OpenSim.Framework.Communications.Cache protected void ProcessReceivedAsset(bool IsTexture, AssetInfo assetInf, IUserService userService) { - if(!IsTexture && assetInf.ContainsReferences && false ) + if (!IsTexture && assetInf.ContainsReferences && false) { - assetInf.Data = ProcessAssetData(assetInf.Data, userService ); + assetInf.Data = ProcessAssetData(assetInf.Data, userService); } } @@ -558,9 +558,9 @@ namespace OpenSim.Framework.Communications.Cache { string data = Encoding.ASCII.GetString(assetData); - data = ProcessAssetDataString(data, userService ); + data = ProcessAssetDataString(data, userService); - return Encoding.ASCII.GetBytes( data ); + return Encoding.ASCII.GetBytes(data); } public string ProcessAssetDataString(string data, IUserService userService) @@ -600,7 +600,7 @@ namespace OpenSim.Framework.Communications.Cache { Guid id; UserProfileData userProfile = userService.GetUserProfile(userUri); - if( userProfile == null ) + if (userProfile == null) { id = Guid.Empty; } diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index 4c3d00e947..1e6955a795 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs @@ -439,10 +439,10 @@ namespace OpenSim.Region.Framework.Scenes protected internal void DetachObject(uint objectLocalID, IClientAPI remoteClient) { SceneObjectGroup group = GetGroupByPrim(objectLocalID); - if( group != null ) + if (group != null) { //group.DetachToGround(); - m_parentScene.DetachSingleAttachmentToInv(group.GetFromAssetID(),remoteClient); + m_parentScene.DetachSingleAttachmentToInv(group.GetFromAssetID(), remoteClient); } } @@ -460,7 +460,7 @@ namespace OpenSim.Region.Framework.Scenes IClientAPI remoteClient, UUID GroupID, uint objectLocalID, UUID Garbage) { SceneObjectGroup group = GetGroupByPrim(objectLocalID); - if( group != null ) + if (group != null) { if (group.OwnerID == remoteClient.AgentId) group.SetGroup(GroupID, remoteClient); @@ -553,7 +553,7 @@ namespace OpenSim.Region.Framework.Scenes IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, Quaternion rot, Vector3 attachPos, bool silent) { SceneObjectGroup group = GetGroupByPrim(objectLocalID); - if( group != null ) + if (group != null) { if (m_parentScene.Permissions.CanTakeObject(group.UUID, remoteClient.AgentId)) { @@ -1534,7 +1534,7 @@ namespace OpenSim.Region.Framework.Scenes for (int i = childPrimIds.Count - 1; i >= 0; i--) { SceneObjectGroup child = GetGroupByPrim(childPrimIds[i]); - if( child != null ) + if (child != null) { // Make sure no child prim is set for sale // So that, on delink, no prims are unwittingly diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 4fdc71ee7f..8e4a9d3942 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs @@ -2357,7 +2357,7 @@ namespace OpenSim.Region.Framework.Scenes { if (m_rootPart.PhysActor.IsPhysical) { - if(m_rootPart.IsWaitingForFirstSpinUpdatePacket) + if (m_rootPart.IsWaitingForFirstSpinUpdatePacket) { // first time initialization of "old" orientation for calculation of delta rotations m_rootPart.SpinOldOrientation = newOrientation; diff --git a/OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs index 13874fa1b0..fdc2bd9b9f 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs @@ -153,7 +153,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat region.Close(); - if(m_regions.Contains(region)) + if (m_regions.Contains(region)) { lock (m_regions) m_regions.Remove(region); } diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs index 5c249b9a7e..0572fc7e76 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs @@ -75,7 +75,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule { if (script.StartsWith("//MRM:C#")) { - if(m_scene.GetSceneObjectPart(localID).OwnerID != m_scene.RegionInfo.MasterAvatarAssignedUUID) + if (m_scene.GetSceneObjectPart(localID).OwnerID != m_scene.RegionInfo.MasterAvatarAssignedUUID) return; try @@ -221,7 +221,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule string[] lines = Script.Split(new string[] {"\n"}, StringSplitOptions.RemoveEmptyEntries); foreach (string s in lines) { - if(s.StartsWith("//@DEPENDS:")) + if (s.StartsWith("//@DEPENDS:")) { libraries.Add(s.Replace("//@DEPENDS:", "")); } diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs index d726de7fa7..22a1126321 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs @@ -65,7 +65,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule { add { - if(!_OnTouchActive) + if (!_OnTouchActive) { GetSOP().Flags |= PrimFlags.Touch; _OnTouchActive = true; diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Test/DrunkenTextAppreciationModule.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Test/DrunkenTextAppreciationModule.cs index 1fb7715b91..778bf7dbdb 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Test/DrunkenTextAppreciationModule.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Test/DrunkenTextAppreciationModule.cs @@ -50,7 +50,7 @@ namespace OpenSim } } - if(e.Sender is IObject) + if (e.Sender is IObject) { // Ignore } @@ -61,4 +61,4 @@ namespace OpenSim } } -} \ No newline at end of file +} diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/World.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/World.cs index f2b3e8113d..cbbe86d91c 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/World.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/World.cs @@ -130,7 +130,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule private void HandleChatPacket(OSChatMessage chat) { - if(string.IsNullOrEmpty(chat.Message)) + if (string.IsNullOrEmpty(chat.Message)) return; // Object? diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs index 8f2f5a0e3c..3bcd949c03 100644 --- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs +++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs @@ -132,7 +132,7 @@ namespace OpenSim.Tests.Common.Setup m.Initialise(scene, config); scene.AddModule(m.Name, m); } - else if(module is IRegionModuleBase) + else if (module is IRegionModuleBase) { // for the new system, everything has to be initialised first, // shared modules have to be post-initialised, then all get an AddRegion with the scene