diff options
| author | Teravus Ovares (Dan Olivares) | 2009-08-26 11:48:05 -0400 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-08-26 11:48:05 -0400 |
| commit | 54e05a083d2aeb7a892647f64edfd52db80ce5ed (patch) | |
| tree | 1fca51f8dd19c0f4871d8e1b875511c6087b3675 /OpenSim/Framework/AvatarAppearance.cs | |
| parent | * It turns out that Physics heightmap values were being stored in managed mem... (diff) | |
| parent | Add reference to OpenMetaverse.dll to UserServer.Modules to make MSVS happy (diff) | |
| download | opensim-SC_OLD-54e05a083d2aeb7a892647f64edfd52db80ce5ed.zip opensim-SC_OLD-54e05a083d2aeb7a892647f64edfd52db80ce5ed.tar.gz opensim-SC_OLD-54e05a083d2aeb7a892647f64edfd52db80ce5ed.tar.bz2 opensim-SC_OLD-54e05a083d2aeb7a892647f64edfd52db80ce5ed.tar.xz | |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/AvatarAppearance.cs')
| -rw-r--r-- | OpenSim/Framework/AvatarAppearance.cs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs index 1fb01ba..940ae3b 100644 --- a/OpenSim/Framework/AvatarAppearance.cs +++ b/OpenSim/Framework/AvatarAppearance.cs | |||
| @@ -510,6 +510,13 @@ namespace OpenSim.Framework | |||
| 510 | if (te != null && te.Length > 0) | 510 | if (te != null && te.Length > 0) |
| 511 | Texture = new Primitive.TextureEntry(te, 0, te.Length); | 511 | Texture = new Primitive.TextureEntry(te, 0, te.Length); |
| 512 | } | 512 | } |
| 513 | else | ||
| 514 | { | ||
| 515 | // We shouldn't be receiving appearance hashtables without a TextureEntry, | ||
| 516 | // but in case we do this will prevent a failure when saving to the database | ||
| 517 | Texture = GetDefaultTexture(); | ||
| 518 | } | ||
| 519 | |||
| 513 | 520 | ||
| 514 | AvatarHeight = (float)Convert.ToDouble((string)h["avatar_height"]); | 521 | AvatarHeight = (float)Convert.ToDouble((string)h["avatar_height"]); |
| 515 | 522 | ||