diff options
author | Justin Clark-Casey (justincc) | 2011-11-09 20:21:48 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-11-09 20:21:48 +0000 |
commit | 674b521fdd24f10964cc4f256486eca6fd6c2cc9 (patch) | |
tree | 1de943e8ec9f4ce86dbdf2872f67efc72b836f1c | |
parent | one final attempt and then im giving up on panda!!!!! (diff) | |
download | opensim-SC_OLD-674b521fdd24f10964cc4f256486eca6fd6c2cc9.zip opensim-SC_OLD-674b521fdd24f10964cc4f256486eca6fd6c2cc9.tar.gz opensim-SC_OLD-674b521fdd24f10964cc4f256486eca6fd6c2cc9.tar.bz2 opensim-SC_OLD-674b521fdd24f10964cc4f256486eca6fd6c2cc9.tar.xz |
In pCampBot, don't try and pull down Primitive faces or sculpts set to null
-rw-r--r-- | OpenSim/Tools/pCampBot/Bot.cs | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/OpenSim/Tools/pCampBot/Bot.cs b/OpenSim/Tools/pCampBot/Bot.cs index 1b30766..669c99b 100644 --- a/OpenSim/Tools/pCampBot/Bot.cs +++ b/OpenSim/Tools/pCampBot/Bot.cs | |||
@@ -447,17 +447,20 @@ namespace pCampBot | |||
447 | 447 | ||
448 | for (int i = 0; i < prim.Textures.FaceTextures.Length; i++) | 448 | for (int i = 0; i < prim.Textures.FaceTextures.Length; i++) |
449 | { | 449 | { |
450 | UUID textureID = prim.Textures.FaceTextures[i].TextureID; | 450 | Primitive.TextureEntryFace face = prim.Textures.FaceTextures[i]; |
451 | 451 | ||
452 | if (textureID != UUID.Zero) | 452 | if (face != null) |
453 | GetTexture(textureID); | 453 | { |
454 | UUID textureID = prim.Textures.FaceTextures[i].TextureID; | ||
455 | |||
456 | if (textureID != UUID.Zero) | ||
457 | GetTexture(textureID); | ||
458 | } | ||
454 | } | 459 | } |
455 | } | 460 | } |
456 | 461 | ||
457 | if (prim.Sculpt.SculptTexture != UUID.Zero) | 462 | if (prim.Sculpt != null && prim.Sculpt.SculptTexture != UUID.Zero) |
458 | { | ||
459 | GetTexture(prim.Sculpt.SculptTexture); | 463 | GetTexture(prim.Sculpt.SculptTexture); |
460 | } | ||
461 | } | 464 | } |
462 | } | 465 | } |
463 | 466 | ||