diff options
author | diva | 2009-02-22 01:26:11 +0000 |
---|---|---|
committer | diva | 2009-02-22 01:26:11 +0000 |
commit | 99b051ccbe7b0f43e8bd5cc8c0012b40e24cb752 (patch) | |
tree | f303bef4e1b7ed4d2d576c1e7fd05f7ceb644ee5 /OpenSim/Framework | |
parent | Update svn properties, add copyright headers, minor formatting cleanup. (diff) | |
download | opensim-SC_OLD-99b051ccbe7b0f43e8bd5cc8c0012b40e24cb752.zip opensim-SC_OLD-99b051ccbe7b0f43e8bd5cc8c0012b40e24cb752.tar.gz opensim-SC_OLD-99b051ccbe7b0f43e8bd5cc8c0012b40e24cb752.tar.bz2 opensim-SC_OLD-99b051ccbe7b0f43e8bd5cc8c0012b40e24cb752.tar.xz |
Addresses some issues with appearance after TPs. Appearance.Owner was not being set, and that's what's being used in SendAppearanceToOtherAgent. Mantis #3204.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/AvatarAppearance.cs | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs index 52041bb..d8fcf74 100644 --- a/OpenSim/Framework/AvatarAppearance.cs +++ b/OpenSim/Framework/AvatarAppearance.cs | |||
@@ -241,6 +241,11 @@ namespace OpenSim.Framework | |||
241 | } | 241 | } |
242 | 242 | ||
243 | public AvatarAppearance() | 243 | public AvatarAppearance() |
244 | : this(UUID.Zero) | ||
245 | { | ||
246 | } | ||
247 | |||
248 | public AvatarAppearance(UUID owner) | ||
244 | { | 249 | { |
245 | m_wearables = new AvatarWearable[MAX_WEARABLES]; | 250 | m_wearables = new AvatarWearable[MAX_WEARABLES]; |
246 | for (int i = 0; i < MAX_WEARABLES; i++) | 251 | for (int i = 0; i < MAX_WEARABLES; i++) |
@@ -249,7 +254,7 @@ namespace OpenSim.Framework | |||
249 | m_wearables[i] = new AvatarWearable(); | 254 | m_wearables[i] = new AvatarWearable(); |
250 | } | 255 | } |
251 | m_serial = 0; | 256 | m_serial = 0; |
252 | m_owner = UUID.Zero; | 257 | m_owner = owner; |
253 | m_visualparams = new byte[VISUALPARAM_COUNT]; | 258 | m_visualparams = new byte[VISUALPARAM_COUNT]; |
254 | SetDefaultWearables(); | 259 | SetDefaultWearables(); |
255 | m_texture = GetDefaultTexture(); | 260 | m_texture = GetDefaultTexture(); |
@@ -286,7 +291,18 @@ namespace OpenSim.Framework | |||
286 | + 0.07f * (float)m_visualparams[78] / 255.0f // Shoe platform height | 291 | + 0.07f * (float)m_visualparams[78] / 255.0f // Shoe platform height |
287 | + 0.3836f * (float)m_visualparams[125] / 255.0f // Leg length | 292 | + 0.3836f * (float)m_visualparams[125] / 255.0f // Leg length |
288 | - m_avatarHeight / 2) * 0.3f - 0.04f; | 293 | - m_avatarHeight / 2) * 0.3f - 0.04f; |
289 | //System.Console.WriteLine("[APPEARANCE]: Height {0} Hip offset {1}", m_avatarHeight, m_hipOffset); | 294 | //System.Console.WriteLine(">>>>>>> [APPEARANCE]: Height {0} Hip offset {1}", m_avatarHeight, m_hipOffset); |
295 | //System.Console.WriteLine("------------- Set Appearance Texture ---------------"); | ||
296 | //Primitive.TextureEntryFace[] faces = Texture.FaceTextures; | ||
297 | //foreach (Primitive.TextureEntryFace face in faces) | ||
298 | //{ | ||
299 | // if (face != null) | ||
300 | // System.Console.WriteLine(" ++ " + face.TextureID); | ||
301 | // else | ||
302 | // System.Console.WriteLine(" ++ NULL "); | ||
303 | //} | ||
304 | //System.Console.WriteLine("----------------------------"); | ||
305 | |||
290 | } | 306 | } |
291 | 307 | ||
292 | public virtual void SetWearable(int wearableId, AvatarWearable wearable) | 308 | public virtual void SetWearable(int wearableId, AvatarWearable wearable) |