diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-05 12:17:54 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-05 12:17:54 +0100 |
| commit | 1ff353452174c37c600d7de650348ab30f91b86c (patch) | |
| tree | f8b2f25561357a7533e58d6a3f54b137f18cff8e /indra/newview | |
| parent | 49a3fc9cc3b47a751d99b31f87458680bd966936 (diff) | |
CID-499
Checker: FORWARD_NULL
Function: LLAppearanceMgr::dumpItemArray(const LLDynamicArray<LLPointer<LLViewerInventoryItem>, (int)32> &, const std::basic_string<char, std::char_traits<char>, std::allocator<char>>&)
File: /indra/newview/llappearancemgr.cpp
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llappearancemgr.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llfloatervoiceeffect.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index 8ef3fa200b..17efc28a6a 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -2590,7 +2590,7 @@ void LLAppearanceMgr::dumpItemArray(const LLInventoryModel::item_array_t& items, { asset_id = linked_item->getAssetUUID(); } - llinfos << msg << " " << i <<" " << item->getName() << " " << asset_id.asString() << llendl; + llinfos << msg << " " << i <<" " << (item ? item->getName() : "(nullitem)") << " " << asset_id.asString() << llendl; } llinfos << llendl; } diff --git a/indra/newview/llfloatervoiceeffect.cpp b/indra/newview/llfloatervoiceeffect.cpp index 3ab061dbea..61fe50e301 100644 --- a/indra/newview/llfloatervoiceeffect.cpp +++ b/indra/newview/llfloatervoiceeffect.cpp @@ -199,7 +199,7 @@ void LLFloaterVoiceEffect::refreshEffectList() if(sl_item) { LLFontGL::StyleFlags style = is_template_only ? LLFontGL::NORMAL : LLFontGL::BOLD; - LLScrollListText slt = dynamic_cast<LLScrollListText*>(sl_item->getColumn(0)); + LLScrollListText* slt = dynamic_cast<LLScrollListText*>(sl_item->getColumn(0)); llassert(slt); if (slt) { |