Pull merge from richard/viewer-chui

2 files changed, 7 insertions, 1 deletions

diff --git a/indra/llui/llfolderview.cpp b/indra/llui/llfolderview.cpp
index c1a11851e2..c8b8bcae48 100644
--- a/indra/llui/llfolderview.cpp
+++ b/indra/llui/llfolderview.cpp
@@ -504,7 +504,11 @@ void LLFolderView::sanitizeSelection()
 		LLFolderViewItem* item = *item_iter;
 
 		// ensure that each ancestor is open and potentially passes filtering
-		BOOL visible = item->getViewModelItem()->potentiallyVisible(); // initialize from filter state for this item
+		BOOL visible = false;
+		if(item->getViewModelItem())
+		{
+			visible = item->getViewModelItem()->potentiallyVisible(); // initialize from filter state for this item
+		}
 		// modify with parent open and filters states
 		LLFolderViewFolder* parent_folder = item->getParentFolder();
 		// Move up through parent folders and see what's visible
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index b827acb185..8839afb60d 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -1359,6 +1359,7 @@ void LLTextBase::onSpellCheckSettingsChange()
 
 void LLTextBase::onFocusReceived()
 {
+	LLUICtrl::onFocusReceived();
 	if (!getLength() && !mLabel.empty())
 	{
 		// delete label which is LLLabelTextSegment
@@ -1368,6 +1369,7 @@ void LLTextBase::onFocusReceived()
 
 void LLTextBase::onFocusLost()
 {
+	LLUICtrl::onFocusLost();
 	if (!getLength() && !mLabel.empty())
 	{
 		resetLabel();