aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra
diff options
context:
space:
mode:
authorArmin Weatherwax2010-09-09 09:44:16 +0200
committerMcCabe Maxsted2010-09-10 19:12:36 -0700
commit677059987a1c8c3359471d8657288b158f015b0f (patch)
tree35e1a122505fb83cd08d76a08e9ab2236f6141f9 /linden/indra
parentfix: 32bit libs for linux64 are not actually downloaded (diff)
downloadmeta-impy-677059987a1c8c3359471d8657288b158f015b0f.zip
meta-impy-677059987a1c8c3359471d8657288b158f015b0f.tar.gz
meta-impy-677059987a1c8c3359471d8657288b158f015b0f.tar.bz2
meta-impy-677059987a1c8c3359471d8657288b158f015b0f.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
Diffstat (limited to 'linden/indra')
-rw-r--r--linden/indra/newview/llagent.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp
index 03d5c65..51b6c53 100644
--- a/linden/indra/newview/llagent.cpp
+++ b/linden/indra/newview/llagent.cpp
@@ -7209,6 +7209,8 @@ void LLAgent::makeNewOutfit(
7209 } 7209 }
7210 7210
7211 LLViewerInventoryItem* item = gInventory.getItem(mWearableEntry[index].mItemID); 7211 LLViewerInventoryItem* item = gInventory.getItem(mWearableEntry[index].mItemID);
7212 if (!item) continue; //e.g. Ruth hair on OpenSim TODO: disable checkbox
7213
7212 S32 todo = addWearableToAgentInventoryCallback::CALL_NONE; 7214 S32 todo = addWearableToAgentInventoryCallback::CALL_NONE;
7213 if (!found_first_item) 7215 if (!found_first_item)
7214 { 7216 {