OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

From: alan webb (alan_webb@us.ibm.com) 

cleanups.
0.6.0-stable
Dr Scofield 2008-09-24 12:04:58 +00:00
parent 201805172f
commit 5787480655
1 changed files with 64 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs
View File

@ -721,14 +721,15 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
private void FormatPart(AppearanceRequestData rdata, string part, UUID item, UUID asset) private void FormatPart(AppearanceRequestData rdata, string part, UUID item, UUID asset)
{ {
if(item != UUID.Zero || asset != UUID.Zero) if (item != UUID.Zero || asset != UUID.Zero)
{ {
rdata.writer.WriteStartElement(part); rdata.writer.WriteStartElement(part);
if(item != UUID.Zero) if (item != UUID.Zero)
{ {
rdata.writer.WriteAttributeString("Item",item.ToString()); rdata.writer.WriteAttributeString("Item",item.ToString());
} }
if(asset != UUID.Zero)
if (asset != UUID.Zero)
{ {
rdata.writer.WriteAttributeString("Item",asset.ToString()); rdata.writer.WriteAttributeString("Item",asset.ToString());
} }
@ -741,14 +742,14 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
Rest.Log.DebugFormat("{0} FormatUserAppearance", MsgId); Rest.Log.DebugFormat("{0} FormatUserAppearance", MsgId);
if(rdata.userAppearance != null) if (rdata.userAppearance != null)
{ {
Rest.Log.DebugFormat("{0} FormatUserAppearance: appearance object exists", MsgId); Rest.Log.DebugFormat("{0} FormatUserAppearance: appearance object exists", MsgId);
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 != null) if (rdata.userAppearance.Owner != null)
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());
@ -771,13 +772,13 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
Hashtable attachments = rdata.userAppearance.GetAttachments(); Hashtable attachments = rdata.userAppearance.GetAttachments();
if(attachments != null) if (attachments != null)
{ {
Rest.Log.DebugFormat("{0} FormatUserAppearance: Formatting attachments", MsgId); Rest.Log.DebugFormat("{0} FormatUserAppearance: Formatting attachments", MsgId);
rdata.writer.WriteStartElement("Attachments"); rdata.writer.WriteStartElement("Attachments");
for (int i=0; i<attachments.Count;i++) for (int i = 0; i < attachments.Count; i++)
{ {
Hashtable attachment = attachments[i] as Hashtable; Hashtable attachment = attachments[i] as Hashtable;
rdata.writer.WriteStartElement("Attachment"); rdata.writer.WriteStartElement("Attachment");
@ -793,19 +794,18 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
if (texture != null && (texture.DefaultTexture != null || texture.FaceTextures != null)) if (texture != null && (texture.DefaultTexture != null || texture.FaceTextures != null))
{ {
Rest.Log.DebugFormat("{0} FormatUserAppearance: Formatting textures", MsgId); Rest.Log.DebugFormat("{0} FormatUserAppearance: Formatting textures", MsgId);
rdata.writer.WriteStartElement("Texture"); rdata.writer.WriteStartElement("Texture");
if(texture.DefaultTexture != null) if (texture.DefaultTexture != null)
{ {
Rest.Log.DebugFormat("{0} FormatUserAppearance: Formatting default texture", MsgId); Rest.Log.DebugFormat("{0} FormatUserAppearance: Formatting default texture", MsgId);
rdata.writer.WriteAttributeString("Default", rdata.writer.WriteAttributeString("Default",
texture.DefaultTexture.TextureID.ToString()); texture.DefaultTexture.TextureID.ToString());
} }
if(texture.FaceTextures != null) if (texture.FaceTextures != null)
{ {
Rest.Log.DebugFormat("{0} FormatUserAppearance: Formatting face textures", MsgId); Rest.Log.DebugFormat("{0} FormatUserAppearance: Formatting face textures", MsgId);