Update svn properties. Minor formatting cleanup. Fix a compiler warning. Fix a UUID vs null comparison.

0.6.0-stable
Jeff Ames 2008-09-28 03:21:11 +00:00
parent e78cdd9690
commit 0b4415849a
5 changed files with 6 additions and 6 deletions

View File

@ -749,7 +749,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
rdata.writer.WriteStartElement("Appearance"); rdata.writer.WriteStartElement("Appearance");
rdata.writer.WriteAttributeString("Height", rdata.userAppearance.AvatarHeight.ToString()); 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("Owner", rdata.userAppearance.Owner.ToString());
rdata.writer.WriteAttributeString("Serial", rdata.userAppearance.Serial.ToString()); rdata.writer.WriteAttributeString("Serial", rdata.userAppearance.Serial.ToString());

View File

@ -826,8 +826,8 @@ namespace OpenSim.Data.MySQL
} }
finally finally
{ {
if(result != null) result.Close(); if (result != null) result.Close();
if(sqlCmd != null) sqlCmd.Dispose(); if (sqlCmd != null) sqlCmd.Dispose();
} }
} }
} }

View File

@ -213,7 +213,7 @@ namespace OpenSim.Region.Environment.Modules.Framework
String debug = "[EVENTQUEUE]: Got request for agent {0} in region {1}: [ "; 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() + " "; debug += key.ToString() + "=" + request[key].ToString() + " ";
} }

View File

@ -3068,7 +3068,7 @@ namespace OpenSim.Region.Environment.Scenes
{ {
List<T> ret = new List<T>(); List<T> ret = new List<T>();
foreach(Object o in ModuleInterfaces[typeof(T)]) foreach (Object o in ModuleInterfaces[typeof(T)])
ret.Add((T)o); ret.Add((T)o);
return ret.ToArray(); return ret.ToArray();
} }

View File

@ -198,7 +198,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
lastScriptEngine.World.DeleteSceneObject( lastScriptEngine.World.DeleteSceneObject(
part.ParentGroup); part.ParentGroup);
} }
catch (Exception e) catch (Exception)
{ {
} }
} }