From 0b4415849ace5ad7bf91a6d0c0374fc101f7136e Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Sun, 28 Sep 2008 03:21:11 +0000 Subject: [PATCH] Update svn properties. Minor formatting cleanup. Fix a compiler warning. Fix a UUID vs null comparison. --- .../Rest/Inventory/RestAppearanceServices.cs | 2 +- OpenSim/Data/MySQL/MySQLInventoryData.cs | 4 ++-- .../Environment/Modules/Framework/EventQueueGetModule.cs | 2 +- OpenSim/Region/Environment/Scenes/Scene.cs | 2 +- .../Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs index 11a749c414..6983154300 100644 --- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs +++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs @@ -749,7 +749,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory rdata.writer.WriteStartElement("Appearance"); rdata.writer.WriteAttributeString("Height", rdata.userAppearance.AvatarHeight.ToString()); - if (!rdata.userAppearance.Owner.Equals(null)) + if (rdata.userAppearance.Owner != UUID.Zero) rdata.writer.WriteAttributeString("Owner", rdata.userAppearance.Owner.ToString()); rdata.writer.WriteAttributeString("Serial", rdata.userAppearance.Serial.ToString()); diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs index 68885e13ad..f9583cf38e 100644 --- a/OpenSim/Data/MySQL/MySQLInventoryData.cs +++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs @@ -826,8 +826,8 @@ namespace OpenSim.Data.MySQL } finally { - if(result != null) result.Close(); - if(sqlCmd != null) sqlCmd.Dispose(); + if (result != null) result.Close(); + if (sqlCmd != null) sqlCmd.Dispose(); } } } diff --git a/OpenSim/Region/Environment/Modules/Framework/EventQueueGetModule.cs b/OpenSim/Region/Environment/Modules/Framework/EventQueueGetModule.cs index 95cdaed01d..ebc9871a5d 100644 --- a/OpenSim/Region/Environment/Modules/Framework/EventQueueGetModule.cs +++ b/OpenSim/Region/Environment/Modules/Framework/EventQueueGetModule.cs @@ -213,7 +213,7 @@ namespace OpenSim.Region.Environment.Modules.Framework String debug = "[EVENTQUEUE]: Got request for agent {0} in region {1}: [ "; - foreach(object key in request.Keys) + foreach (object key in request.Keys) { debug += key.ToString() + "=" + request[key].ToString() + " "; } diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index e5f10b8662..ceec7bca53 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs @@ -3068,7 +3068,7 @@ namespace OpenSim.Region.Environment.Scenes { List ret = new List(); - foreach(Object o in ModuleInterfaces[typeof(T)]) + foreach (Object o in ModuleInterfaces[typeof(T)]) ret.Add((T)o); return ret.ToArray(); } diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs index 16dafdc821..60fdf39f74 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs @@ -198,7 +198,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine lastScriptEngine.World.DeleteSceneObject( part.ParentGroup); } - catch (Exception e) + catch (Exception) { } }