Update svn properties. Minor formatting cleanup. Fix a compiler warning. Fix a UUID vs null comparison.
parent
e78cdd9690
commit
0b4415849a
|
@ -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());
|
||||
|
||||
|
|
|
@ -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();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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() + " ";
|
||||
}
|
||||
|
|
|
@ -3068,7 +3068,7 @@ namespace OpenSim.Region.Environment.Scenes
|
|||
{
|
||||
List<T> ret = new List<T>();
|
||||
|
||||
foreach(Object o in ModuleInterfaces[typeof(T)])
|
||||
foreach (Object o in ModuleInterfaces[typeof(T)])
|
||||
ret.Add((T)o);
|
||||
return ret.ToArray();
|
||||
}
|
||||
|
|
|
@ -198,7 +198,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
|
|||
lastScriptEngine.World.DeleteSceneObject(
|
||||
part.ParentGroup);
|
||||
}
|
||||
catch (Exception e)
|
||||
catch (Exception)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue