Merge branch 'master' into DRTVWR-548-maint-N

# Conflicts:
#	indra/newview/llfloaterworldmap.cpp
#	indra/newview/llvovolume.cpp

1 files changed, 28 insertions, 19 deletions

diff --git a/indra/newview/llconversationview.cpp b/indra/newview/llconversationview.cpp
index 20fa6d490b..48c7df40df 100644
--- a/indra/newview/llconversationview.cpp
+++ b/indra/newview/llconversationview.cpp
@@ -272,9 +272,9 @@ BOOL LLConversationViewSession::postBuild()
 		default:
 			break;
 		}
-	}
 
-	refresh();
+        refresh(); // requires vmi
+	}
 
 	return TRUE;
 }
@@ -490,17 +490,20 @@ void LLConversationViewSession::refresh()
 {
 	// Refresh the session view from its model data
 	LLConversationItem* vmi = dynamic_cast<LLConversationItem*>(getViewModelItem());
-	vmi->resetRefresh();
+    if (vmi)
+    {
+        vmi->resetRefresh();
 
-	if (mSessionTitle)
-	{		
-		if (!highlightFriendTitle(vmi))
-		{
-			LLStyle::Params title_style;
-			title_style.color = LLUIColorTable::instance().getColor("LabelTextColor");
-			mSessionTitle->setText(vmi->getDisplayName(), title_style);
-		}
-	}
+        if (mSessionTitle)
+        {
+            if (!highlightFriendTitle(vmi))
+            {
+                LLStyle::Params title_style;
+                title_style.color = LLUIColorTable::instance().getColor("LabelTextColor");
+                mSessionTitle->setText(vmi->getDisplayName(), title_style);
+            }
+        }
+    }
 
 	// Update all speaking indicators
 	LLSpeakingIndicatorManager::updateSpeakingIndicators();
@@ -524,8 +527,11 @@ void LLConversationViewSession::refresh()
 	}
 
 	requestArrange();
-	// Do the regular upstream refresh
-	LLFolderViewFolder::refresh();
+    if (vmi)
+    {
+        // Do the regular upstream refresh
+        LLFolderViewFolder::refresh();
+    }
 }
 
 void LLConversationViewSession::onCurrentVoiceSessionChanged(const LLUUID& session_id)
@@ -627,8 +633,11 @@ BOOL LLConversationViewParticipant::postBuild()
     }
 
     updateChildren();
-	LLFolderViewItem::postBuild();
-    refresh();
+    if (getViewModelItem())
+    {
+        LLFolderViewItem::postBuild();
+        refresh();
+    }
     return TRUE;
 }
 
@@ -712,10 +721,10 @@ void LLConversationViewParticipant::refresh()
 
         // *TODO: We should also do something with vmi->isModerator() to echo that state in the UI somewhat
         mSpeakingIndicator->setIsModeratorMuted(participant_model->isModeratorMuted());
+        
+        // Do the regular upstream refresh
+        LLFolderViewItem::refresh();
     }
-
-	// Do the regular upstream refresh
-	LLFolderViewItem::refresh();
 }
 
 void LLConversationViewParticipant::addToFolder(LLFolderViewFolder* folder)