diff options
Diffstat (limited to 'OpenSim')
5 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs index 11a749c..6983154 100644 --- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs +++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs | |||
@@ -749,7 +749,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
749 | rdata.writer.WriteStartElement("Appearance"); | 749 | rdata.writer.WriteStartElement("Appearance"); |
750 | 750 | ||
751 | rdata.writer.WriteAttributeString("Height", rdata.userAppearance.AvatarHeight.ToString()); | 751 | rdata.writer.WriteAttributeString("Height", rdata.userAppearance.AvatarHeight.ToString()); |
752 | if (!rdata.userAppearance.Owner.Equals(null)) | 752 | if (rdata.userAppearance.Owner != UUID.Zero) |
753 | rdata.writer.WriteAttributeString("Owner", rdata.userAppearance.Owner.ToString()); | 753 | rdata.writer.WriteAttributeString("Owner", rdata.userAppearance.Owner.ToString()); |
754 | rdata.writer.WriteAttributeString("Serial", rdata.userAppearance.Serial.ToString()); | 754 | rdata.writer.WriteAttributeString("Serial", rdata.userAppearance.Serial.ToString()); |
755 | 755 | ||
diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs index 68885e1..f9583cf 100644 --- a/OpenSim/Data/MySQL/MySQLInventoryData.cs +++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs | |||
@@ -826,8 +826,8 @@ namespace OpenSim.Data.MySQL | |||
826 | } | 826 | } |
827 | finally | 827 | finally |
828 | { | 828 | { |
829 | if(result != null) result.Close(); | 829 | if (result != null) result.Close(); |
830 | if(sqlCmd != null) sqlCmd.Dispose(); | 830 | if (sqlCmd != null) sqlCmd.Dispose(); |
831 | } | 831 | } |
832 | } | 832 | } |
833 | } | 833 | } |
diff --git a/OpenSim/Region/Environment/Modules/Framework/EventQueueGetModule.cs b/OpenSim/Region/Environment/Modules/Framework/EventQueueGetModule.cs index 95cdaed..ebc9871 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 | |||
213 | 213 | ||
214 | 214 | ||
215 | String debug = "[EVENTQUEUE]: Got request for agent {0} in region {1}: [ "; | 215 | String debug = "[EVENTQUEUE]: Got request for agent {0} in region {1}: [ "; |
216 | foreach(object key in request.Keys) | 216 | foreach (object key in request.Keys) |
217 | { | 217 | { |
218 | debug += key.ToString() + "=" + request[key].ToString() + " "; | 218 | debug += key.ToString() + "=" + request[key].ToString() + " "; |
219 | } | 219 | } |
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index e5f10b8..ceec7bc 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -3068,7 +3068,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
3068 | { | 3068 | { |
3069 | List<T> ret = new List<T>(); | 3069 | List<T> ret = new List<T>(); |
3070 | 3070 | ||
3071 | foreach(Object o in ModuleInterfaces[typeof(T)]) | 3071 | foreach (Object o in ModuleInterfaces[typeof(T)]) |
3072 | ret.Add((T)o); | 3072 | ret.Add((T)o); |
3073 | return ret.ToArray(); | 3073 | return ret.ToArray(); |
3074 | } | 3074 | } |
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs index 16dafdc..60fdf39 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs | |||
@@ -198,7 +198,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
198 | lastScriptEngine.World.DeleteSceneObject( | 198 | lastScriptEngine.World.DeleteSceneObject( |
199 | part.ParentGroup); | 199 | part.ParentGroup); |
200 | } | 200 | } |
201 | catch (Exception e) | 201 | catch (Exception) |
202 | { | 202 | { |
203 | } | 203 | } |
204 | } | 204 | } |