From 3f79e6b3e766aa508858ee3fcec6f9b6403a35fc Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Tue, 23 Sep 2008 23:14:00 +0000 Subject: Update svn properties, formatting cleanup. --- .../Rest/Inventory/RestAppearanceServices.cs | 4 ++-- .../ApplicationPlugins/Rest/Inventory/RestAssetServices.cs | 14 +++++++------- OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 2 +- .../Modules/World/Permissions/PermissionsModule.cs | 2 +- OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | 14 +++++++------- .../DotNetEngine/Compiler/LSL/CSCodeGenerator.cs | 4 ++-- .../ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs | 4 ++-- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs index 8db3fde..82c0c2b 100644 --- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs +++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs @@ -397,8 +397,8 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory if (rdata.userAppearance != null) { - modified = true; - Rest.AvatarServices.UpdateUserAppearance(rdata.userProfile.ID, rdata.userAppearance); + modified = true; + Rest.AvatarServices.UpdateUserAppearance(rdata.userProfile.ID, rdata.userAppearance); } if (created) diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs index dcd209f..9af5cd0 100644 --- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs +++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs @@ -248,8 +248,8 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory private void DoPut(AssetRequestData rdata) { - bool modified = false; - bool created = false; + bool modified = false; + bool created = false; Rest.Log.DebugFormat("{0} REST Asset handler, Method = <{1}> ENTRY", MsgId, rdata.method); @@ -269,7 +269,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory AssetBase asset = Rest.AssetServices.GetAsset(uuid, false); modified = (asset != null); - created = !modified; + created = !modified; asset = new AssetBase(); asset.FullID = uuid; @@ -283,7 +283,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory if (asset.ID != rdata.Parameters[0]) { Rest.Log.WarnFormat("{0} URI and payload disagree on UUID U:{1} vs P:{2}", - MsgId, rdata.Parameters[0], asset.ID); + MsgId, rdata.Parameters[0], asset.ID); } Rest.AssetServices.AddAsset(asset); @@ -323,8 +323,8 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory private void DoPost(AssetRequestData rdata) { - bool modified = false; - bool created = false; + bool modified = false; + bool created = false; Rest.Log.DebugFormat("{0} REST Asset handler, Method = <{1}> ENTRY", MsgId, rdata.method); @@ -347,7 +347,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory AssetBase asset = Rest.AssetServices.GetAsset(uuid, false); modified = (asset != null); - created = !modified; + created = !modified; asset = new AssetBase(); asset.FullID = uuid; diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 62d6efe..27e2e5c 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs @@ -5286,7 +5286,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP break; case PacketType.RezScript: - m_log.DebugFormat("[AMW] RezScript"); + m_log.DebugFormat("[AMW] RezScript"); //Console.WriteLine(Pack.ToString()); RezScriptPacket rezScriptx = (RezScriptPacket)Pack; diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs index 9ce6a77..16743ea 100644 --- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs @@ -612,7 +612,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions // TODO: add group support! // - if(part.OwnerID != editorID) + if (part.OwnerID != editorID) return false; return GenericObjectPermission(editorID, objectID, false); diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs index c1c1b6e..015b140 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs @@ -1201,9 +1201,9 @@ namespace OpenSim.Region.Environment.Scenes if (part != null) { if (!ExternalChecks.ExternalChecksCanEditObjectInventory(part.UUID, remoteClient.AgentId)) - { - return; - } + { + return; + } TaskInventoryItem currentItem = part.GetInventoryItem(itemID); @@ -1296,10 +1296,10 @@ System.Console.WriteLine("Item asset {0}, request asset {1}", prevItem.AssetID.T SceneObjectPart part = GetSceneObjectPart(localID); if (part != null) { - if (!ExternalChecks.ExternalChecksCanEditObjectInventory(part.UUID, remoteClient.AgentId)) - { - return; - } + if (!ExternalChecks.ExternalChecksCanEditObjectInventory(part.UUID, remoteClient.AgentId)) + { + return; + } part.ParentGroup.AddInventoryItem(remoteClient, localID, item, copyID); // TODO: set this to "true" when scripts in inventory have persistent state to fire on_rez diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/CSCodeGenerator.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/CSCodeGenerator.cs index b16577d..c4b0fd4 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/CSCodeGenerator.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/CSCodeGenerator.cs @@ -730,11 +730,11 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL c.Value = c.Value.Insert(dotIndex, "0"); c.Value = "new LSL_Types.LSLFloat("+c.Value+")"; } - else if("LSL_Types.LSLInteger" == c.Type) + else if ("LSL_Types.LSLInteger" == c.Type) { c.Value = "new LSL_Types.LSLInteger("+c.Value+")"; } - else if("LSL_Types.LSLString" == c.Type) + else if ("LSL_Types.LSLString" == c.Type) { c.Value = "new LSL_Types.LSLString(\""+c.Value+"\")"; } diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs index 5a98f4d..86d6188 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs @@ -730,11 +730,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools c.Value = c.Value.Insert(dotIndex, "0"); c.Value = "new LSL_Types.LSLFloat("+c.Value+")"; } - else if("LSL_Types.LSLInteger" == c.Type) + else if ("LSL_Types.LSLInteger" == c.Type) { c.Value = "new LSL_Types.LSLInteger("+c.Value+")"; } - else if("LSL_Types.LSLString" == c.Type) + else if ("LSL_Types.LSLString" == c.Type) { c.Value = "new LSL_Types.LSLString(\""+c.Value+"\")"; } -- cgit v1.1