Initial update to OpenSim 0.8.2.1 source code.

1 files changed, 37 insertions, 9 deletions

diff --git a/OpenSim/Services/Interfaces/IAvatarService.cs b/OpenSim/Services/Interfaces/IAvatarService.cs
index 863fd93..892e0b4 100644
--- a/OpenSim/Services/Interfaces/IAvatarService.cs
+++ b/OpenSim/Services/Interfaces/IAvatarService.cs
@@ -162,10 +162,15 @@ namespace OpenSim.Services.Interfaces
             }
 
             // Visual Params
-            string[] vps = new string[AvatarAppearance.VISUALPARAM_COUNT];
+            //string[] vps = new string[AvatarAppearance.VISUALPARAM_COUNT];
+            //byte[] binary = appearance.VisualParams;
+
+            //            for (int i = 0 ; i < AvatarAppearance.VISUALPARAM_COUNT ; i++)
+
             byte[] binary = appearance.VisualParams;
+            string[] vps = new string[binary.Length];
 
-            for (int i = 0 ; i < AvatarAppearance.VISUALPARAM_COUNT ; i++)
+            for (int i = 0; i < binary.Length; i++)
             {
                 vps[i] = binary[i].ToString();
             }
@@ -174,11 +179,18 @@ namespace OpenSim.Services.Interfaces
 
             // Attachments
             List<AvatarAttachment> attachments = appearance.GetAttachments();
+            Dictionary<int, List<string>> atts = new Dictionary<int, List<string>>();
             foreach (AvatarAttachment attach in attachments)
             {
                 if (attach.ItemID != UUID.Zero)
-                    Data["_ap_" + attach.AttachPoint] = attach.ItemID.ToString();
+                {
+                    if (!atts.ContainsKey(attach.AttachPoint))
+                        atts[attach.AttachPoint] = new List<string>();
+                    atts[attach.AttachPoint].Add(attach.ItemID.ToString());
+                }
             }
+            foreach (KeyValuePair<int, List<string>> kvp in atts)
+                Data["_ap_" + kvp.Key] = string.Join(",", kvp.Value.ToArray());
         }
 
         public AvatarAppearance ToAvatarAppearance()
@@ -195,7 +207,13 @@ namespace OpenSim.Services.Interfaces
                     appearance.Serial = Int32.Parse(Data["Serial"]);
 
                 if (Data.ContainsKey("AvatarHeight"))
-                    appearance.AvatarHeight = float.Parse(Data["AvatarHeight"]);
+                {
+                    float h = float.Parse(Data["AvatarHeight"]);
+                    if( h == 0f)
+                        h = 1.9f;
+                  
+                    appearance.AvatarHeight = h;
+                }
 
                 // Legacy Wearables
                 if (Data.ContainsKey("BodyItem"))
@@ -266,9 +284,13 @@ namespace OpenSim.Services.Interfaces
                 if (Data.ContainsKey("VisualParams"))
                 {
                     string[] vps = Data["VisualParams"].Split(new char[] {','});
-                    byte[] binary = new byte[AvatarAppearance.VISUALPARAM_COUNT];
+                    //byte[] binary = new byte[AvatarAppearance.VISUALPARAM_COUNT];
 
-                    for (int i = 0 ; i < vps.Length && i < binary.Length ; i++)
+                    //for (int i = 0 ; i < vps.Length && i < binary.Length ; i++)
+                    
+                    byte[] binary = new byte[vps.Length];
+
+                    for (int i = 0; i < vps.Length; i++)
                         binary[i] = (byte)Convert.ToInt32(vps[i]);
                     
                     appearance.VisualParams = binary;
@@ -304,10 +326,16 @@ namespace OpenSim.Services.Interfaces
                     if (!Int32.TryParse(pointStr, out point))
                         continue;
 
-                    UUID uuid = UUID.Zero;
-                    UUID.TryParse(_kvp.Value, out uuid);
+                    List<string> idList = new List<string>(_kvp.Value.Split(new char[] {','}));
 
-                    appearance.SetAttachment(point, uuid, UUID.Zero);
+                    appearance.SetAttachment(point, UUID.Zero, UUID.Zero);
+                    foreach (string id in idList)
+                    {
+                        UUID uuid = UUID.Zero;
+                        UUID.TryParse(id, out uuid);
+
+                        appearance.SetAttachment(point | 0x80, uuid, UUID.Zero);
+                    }
                 }
 
                 if (appearance.Wearables[AvatarWearable.BODY].Count == 0)