Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion indra/llui/llflatlistview.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ const LLRect& LLFlatListView::getItemsRect() const
bool LLFlatListView::addItem(LLPanel * item, const LLSD& value /*= LLUUID::null*/, EAddPosition pos /*= ADD_BOTTOM*/,bool rearrange /*= true*/)
{
if (!item) return false;
if (value.isUndefined()) return false;
if (value.isUndefined()) return false; // item stays an orphan?!!!

//force uniqueness of items, easiest check but unreliable
if (item->getParent() == mItemsPanel) return false;
Expand Down
2 changes: 1 addition & 1 deletion indra/newview/llfloaterwebcontent.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ void LLFloaterWebContent::initializeURLHistory()
for(; iter_history != end_history; ++iter_history)
{
std::string url = (*iter_history).asString();
if(! url.empty())
if(! url.empty() && url_list)
url_list->addSimpleElement(url);
}
}
Expand Down
Loading