Merge branch develop into project/fonts-update

# Conflicts:
#	indra/llrender/llfontfreetype.cpp

1 files changed, 9 insertions, 1 deletions

diff --git a/indra/newview/lltoast.cpp b/indra/newview/lltoast.cpp
index 84503e66a5..0f871dc1bb 100644
--- a/indra/newview/lltoast.cpp
+++ b/indra/newview/lltoast.cpp
@@ -421,7 +421,7 @@ void LLToast::setVisible(bool show)
         if(mHideBtn)
             mHideBtn->setVisible(show);
     }
-    LLFloater::setVisible(show);
+    LLModalDialog::setVisible(show);
     if (mPanel
         && !mPanel->isDead()
         && mWrapperPanel
@@ -436,6 +436,14 @@ void LLToast::setVisible(bool show)
 
 void LLToast::updateHoveredState()
 {
+    if (!mWrapperPanel)
+    {
+        // Shouldn't be happening.
+        // mWrapperPanel should have been inited in the constructor
+        // This needs to be figured out and fixed
+        llassert(false);
+        return;
+    }
     S32 x, y;
     LLUI::getInstance()->getMousePositionScreen(&x, &y);