diff options
| author | Armin Weatherwax | 2010-09-09 09:44:16 +0200 |
|---|---|---|
| committer | Jacek Antonelli | 2010-09-16 21:09:57 -0500 |
| commit | 7969cf9e70952bd2ed3280d244ee9d7266486a99 (patch) | |
| tree | 2891010186f425ba37766d74e18aca95b527d1b8 | |
| parent | fix: 32bit libs for linux64 are not actually downloaded (diff) | |
| download | meta-impy-7969cf9e70952bd2ed3280d244ee9d7266486a99.zip meta-impy-7969cf9e70952bd2ed3280d244ee9d7266486a99.tar.gz meta-impy-7969cf9e70952bd2ed3280d244ee9d7266486a99.tar.bz2 meta-impy-7969cf9e70952bd2ed3280d244ee9d7266486a99.tar.xz | |
fix Bug #240: Make Outfit crashes the viewer in OpenSim
this was due NULL wearables - todo: grey the checkboxes out then, maybe (firstuse)warn
| -rw-r--r-- | linden/indra/newview/llagent.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp index 38e1c0f..db9241f 100644 --- a/linden/indra/newview/llagent.cpp +++ b/linden/indra/newview/llagent.cpp | |||
| @@ -7197,6 +7197,8 @@ void LLAgent::makeNewOutfit( | |||
| 7197 | } | 7197 | } |
| 7198 | 7198 | ||
| 7199 | LLViewerInventoryItem* item = gInventory.getItem(mWearableEntry[index].mItemID); | 7199 | LLViewerInventoryItem* item = gInventory.getItem(mWearableEntry[index].mItemID); |
| 7200 | if (!item) continue; //e.g. Ruth hair on OpenSim TODO: disable checkbox | ||
| 7201 | |||
| 7200 | S32 todo = addWearableToAgentInventoryCallback::CALL_NONE; | 7202 | S32 todo = addWearableToAgentInventoryCallback::CALL_NONE; |
| 7201 | if (!found_first_item) | 7203 | if (!found_first_item) |
| 7202 | { | 7204 | { |