aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/AvatarAppearance.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-10-28 21:31:23 +0000
committerJustin Clarke Casey2008-10-28 21:31:23 +0000
commit1ff9709ea3d5e7c9ef21f6f59ae0dce62dd7b1c4 (patch)
tree8eeadcfcbee10726afd731a85bf569df3dc0916c /OpenSim/Framework/AvatarAppearance.cs
parent* minor: Add documentation to some of the appearance methods, change some log... (diff)
downloadopensim-SC_OLD-1ff9709ea3d5e7c9ef21f6f59ae0dce62dd7b1c4.zip
opensim-SC_OLD-1ff9709ea3d5e7c9ef21f6f59ae0dce62dd7b1c4.tar.gz
opensim-SC_OLD-1ff9709ea3d5e7c9ef21f6f59ae0dce62dd7b1c4.tar.bz2
opensim-SC_OLD-1ff9709ea3d5e7c9ef21f6f59ae0dce62dd7b1c4.tar.xz
* Possibly fix grey avatar appearance problems
* And hopefully rebaking all the time should no longer be necessary now * It turns out that when the client baked the texture, the uploaded asset had the Temporary flag to true (Temporary is actually deprecated). * It also had the StoreLocal flag set to true, which signifies that the asset should be stored locally. If it disappears we should reply to the asset request with ImageNotInDatabasePacket * However, last time this was enabled some clients started crashing. This may well no longer be the case and needs to be tested, but in the mean time we will store the asset instead. * This needs to be resolved in a better way, possibly by starting to send the ImageNotInDatabase packet again instead
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/AvatarAppearance.cs25
1 files changed, 19 insertions, 6 deletions
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs
index 0c0cfd5..e1d0bbe 100644
--- a/OpenSim/Framework/AvatarAppearance.cs
+++ b/OpenSim/Framework/AvatarAppearance.cs
@@ -28,8 +28,10 @@
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Reflection;
31using System.Runtime.Serialization; 32using System.Runtime.Serialization;
32using System.Security.Permissions; 33using System.Security.Permissions;
34using log4net;
33using OpenMetaverse; 35using OpenMetaverse;
34using OpenMetaverse.Packets; 36using OpenMetaverse.Packets;
35using OpenSim.Framework; 37using OpenSim.Framework;
@@ -39,6 +41,9 @@ namespace OpenSim.Framework
39 [Serializable] 41 [Serializable]
40 public class AvatarAppearance : ISerializable 42 public class AvatarAppearance : ISerializable
41 { 43 {
44// private static readonly ILog m_log
45// = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
46
42 // these are guessed at by the list here - 47 // these are guessed at by the list here -
43 // http://wiki.secondlife.com/wiki/Avatar_Appearance. We'll 48 // http://wiki.secondlife.com/wiki/Avatar_Appearance. We'll
44 // correct them over time for when were are wrong. 49 // correct them over time for when were are wrong.
@@ -258,7 +263,7 @@ namespace OpenSim.Framework
258 } 263 }
259 264
260 /// <summary> 265 /// <summary>
261 /// 266 /// Set up appearance textures and avatar parameters, including a height calculation
262 /// </summary> 267 /// </summary>
263 /// <param name="texture"></param> 268 /// <param name="texture"></param>
264 /// <param name="visualParam"></param> 269 /// <param name="visualParam"></param>
@@ -266,7 +271,15 @@ namespace OpenSim.Framework
266 { 271 {
267 Primitive.TextureEntry textureEnt = new Primitive.TextureEntry(texture, 0, texture.Length); 272 Primitive.TextureEntry textureEnt = new Primitive.TextureEntry(texture, 0, texture.Length);
268 m_texture = textureEnt; 273 m_texture = textureEnt;
269 274
275// m_log.DebugFormat("[APPEARANCE]: Setting an avatar appearance with {0} faces", m_texture.FaceTextures.Length);
276// for (int i = 0; i < m_texture.FaceTextures.Length; i++)
277// {
278// Primitive.TextureEntryFace face = m_texture.FaceTextures[i];
279// String textureIdString = (face != null ? face.TextureID.ToString() : "none");
280// m_log.DebugFormat("[APPEARANCE]: Texture {0} is {1}", i, textureIdString);
281// }
282
270 m_visualparams = visualParam.ToArray(); 283 m_visualparams = visualParam.ToArray();
271 284
272 // Teravus : Nifty AV Height Getting Maaaaagical formula. Oh how we love turning 0-255 into meters. 285 // Teravus : Nifty AV Height Getting Maaaaagical formula. Oh how we love turning 0-255 into meters.
@@ -297,10 +310,10 @@ namespace OpenSim.Framework
297 public override String ToString() 310 public override String ToString()
298 { 311 {
299 String s = "[Wearables] =>"; 312 String s = "[Wearables] =>";
300 s += "Body Item: " + BodyItem.ToString() + ";"; 313 s += " Body Item: " + BodyItem.ToString() + ";";
301 s += "Skin Item: " + SkinItem.ToString() + ";"; 314 s += " Skin Item: " + SkinItem.ToString() + ";";
302 s += "Shirt Item: " + ShirtItem.ToString() + ";"; 315 s += " Shirt Item: " + ShirtItem.ToString() + ";";
303 s += "Pants Item: " + PantsItem.ToString() + ";"; 316 s += " Pants Item: " + PantsItem.ToString() + ";";
304 return s; 317 return s;
305 } 318 }
306 319