From 1ff353452174c37c600d7de650348ab30f91b86c Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Mon, 5 Jul 2010 12:17:54 +0100
Subject: [PATCH] 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
---
indra/newview/llappearancemgr.cpp | 2 +-
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 8ef3fa200b5..17efc28a6a5 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 3ab061dbea6..61fe50e3016 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)
{
--
GitLab