aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Interfaces/IAvatarService.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Services/Interfaces/IAvatarService.cs')
-rw-r--r--OpenSim/Services/Interfaces/IAvatarService.cs15
1 files changed, 8 insertions, 7 deletions
diff --git a/OpenSim/Services/Interfaces/IAvatarService.cs b/OpenSim/Services/Interfaces/IAvatarService.cs
index 892e0b4..b4dc511 100644
--- a/OpenSim/Services/Interfaces/IAvatarService.cs
+++ b/OpenSim/Services/Interfaces/IAvatarService.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Services.Interfaces
51 /// <param name="appearance"></param> 51 /// <param name="appearance"></param>
52 /// <returns></returns> 52 /// <returns></returns>
53 bool SetAppearance(UUID userID, AvatarAppearance appearance); 53 bool SetAppearance(UUID userID, AvatarAppearance appearance);
54 54
55 /// <summary> 55 /// <summary>
56 /// Called by the login service 56 /// Called by the login service
57 /// </summary> 57 /// </summary>
@@ -75,7 +75,7 @@ namespace OpenSim.Services.Interfaces
75 bool ResetAvatar(UUID userID); 75 bool ResetAvatar(UUID userID);
76 76
77 /// <summary> 77 /// <summary>
78 /// These methods raison d'etre: 78 /// These methods raison d'etre:
79 /// No need to send the entire avatar data (SetAvatar) for changing attachments 79 /// No need to send the entire avatar data (SetAvatar) for changing attachments
80 /// </summary> 80 /// </summary>
81 /// <param name="userID"></param> 81 /// <param name="userID"></param>
@@ -150,7 +150,8 @@ namespace OpenSim.Services.Interfaces
150 // Wearables 150 // Wearables
151 Data["AvatarHeight"] = appearance.AvatarHeight.ToString(); 151 Data["AvatarHeight"] = appearance.AvatarHeight.ToString();
152 152
153 for (int i = 0 ; i < AvatarWearable.MAX_WEARABLES ; i++) 153 // TODO: With COF, is this even needed?
154 for (int i = 0 ; i < AvatarWearable.LEGACY_VERSION_MAX_WEARABLES ; i++)
154 { 155 {
155 for (int j = 0 ; j < appearance.Wearables[i].Count ; j++) 156 for (int j = 0 ; j < appearance.Wearables[i].Count ; j++)
156 { 157 {
@@ -211,8 +212,8 @@ namespace OpenSim.Services.Interfaces
211 float h = float.Parse(Data["AvatarHeight"]); 212 float h = float.Parse(Data["AvatarHeight"]);
212 if( h == 0f) 213 if( h == 0f)
213 h = 1.9f; 214 h = 1.9f;
214 215 appearance.SetSize(new Vector3(0.45f, 0.6f, h ));
215 appearance.AvatarHeight = h; 216// appearance.AvatarHeight = float.Parse(Data["AvatarHeight"]);
216 } 217 }
217 218
218 // Legacy Wearables 219 // Legacy Wearables
@@ -287,12 +288,11 @@ namespace OpenSim.Services.Interfaces
287 //byte[] binary = new byte[AvatarAppearance.VISUALPARAM_COUNT]; 288 //byte[] binary = new byte[AvatarAppearance.VISUALPARAM_COUNT];
288 289
289 //for (int i = 0 ; i < vps.Length && i < binary.Length ; i++) 290 //for (int i = 0 ; i < vps.Length && i < binary.Length ; i++)
290
291 byte[] binary = new byte[vps.Length]; 291 byte[] binary = new byte[vps.Length];
292 292
293 for (int i = 0; i < vps.Length; i++) 293 for (int i = 0; i < vps.Length; i++)
294 binary[i] = (byte)Convert.ToInt32(vps[i]); 294 binary[i] = (byte)Convert.ToInt32(vps[i]);
295 295
296 appearance.VisualParams = binary; 296 appearance.VisualParams = binary;
297 } 297 }
298 298
@@ -357,6 +357,7 @@ namespace OpenSim.Services.Interfaces
357 appearance.Wearables[AvatarWearable.EYES].Wear( 357 appearance.Wearables[AvatarWearable.EYES].Wear(
358 AvatarWearable.DefaultWearables[ 358 AvatarWearable.DefaultWearables[
359 AvatarWearable.EYES][0]); 359 AvatarWearable.EYES][0]);
360
360 } 361 }
361 catch 362 catch
362 { 363 {