diff options
| author | Teravus Ovares (Dan Olivares) | 2009-08-25 16:13:02 -0400 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-08-25 16:13:02 -0400 |
| commit | a7917b428a6bc3c9e33da64879b9e473516540a3 (patch) | |
| tree | 2c38d9c33c4977a3d0356912915082a8bd568a23 /OpenSim/Framework/AvatarAppearance.cs | |
| parent | Patch from jhurliman to HttpServer (diff) | |
| parent | Implemented osPenCap, that sets EndCap and StartCap to Pen. This allows using... (diff) | |
| download | opensim-SC-a7917b428a6bc3c9e33da64879b9e473516540a3.zip opensim-SC-a7917b428a6bc3c9e33da64879b9e473516540a3.tar.gz opensim-SC-a7917b428a6bc3c9e33da64879b9e473516540a3.tar.bz2 opensim-SC-a7917b428a6bc3c9e33da64879b9e473516540a3.tar.xz | |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/AvatarAppearance.cs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs index 7270f32..1fb01ba 100644 --- a/OpenSim/Framework/AvatarAppearance.cs +++ b/OpenSim/Framework/AvatarAppearance.cs | |||
| @@ -503,7 +503,14 @@ namespace OpenSim.Framework | |||
| 503 | Owner = new UUID((string)h["owner"]); | 503 | Owner = new UUID((string)h["owner"]); |
| 504 | Serial = Convert.ToInt32((string)h["serial"]); | 504 | Serial = Convert.ToInt32((string)h["serial"]); |
| 505 | VisualParams = (byte[])h["visual_params"]; | 505 | VisualParams = (byte[])h["visual_params"]; |
| 506 | Texture = new Primitive.TextureEntry((byte[])h["texture"], 0, ((byte[])h["texture"]).Length); | 506 | |
| 507 | if (h.Contains("texture")) | ||
| 508 | { | ||
| 509 | byte[] te = h["texture"] as byte[]; | ||
| 510 | if (te != null && te.Length > 0) | ||
| 511 | Texture = new Primitive.TextureEntry(te, 0, te.Length); | ||
| 512 | } | ||
| 513 | |||
| 507 | AvatarHeight = (float)Convert.ToDouble((string)h["avatar_height"]); | 514 | AvatarHeight = (float)Convert.ToDouble((string)h["avatar_height"]); |
| 508 | 515 | ||
| 509 | m_wearables = new AvatarWearable[MAX_WEARABLES]; | 516 | m_wearables = new AvatarWearable[MAX_WEARABLES]; |