1 files changed, 13 insertions, 3 deletions

diff --git a/linden/indra/llui/llmodaldialog.cpp b/linden/indra/llui/llmodaldialog.cpp
index 72a7fcb..ff4858f 100644
--- a/linden/indra/llui/llmodaldialog.cpp
+++ b/linden/indra/llui/llmodaldialog.cpp
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -70,6 +70,16 @@ LLModalDialog::~LLModalDialog()
         }
 }
 
+// virtual
+void LLModalDialog::open()      /* Flawfinder: ignore */
+{
+        // SJB: Hack! Make sure we don't ever host a modal dialog
+        LLMultiFloater* thost = LLFloater::sHostp;
+        LLFloater::sHostp = NULL;
+        LLFloater::open();
+        LLFloater::sHostp = thost;
+}
+
 void LLModalDialog::reshape(S32 width, S32 height, BOOL called_from_parent)
 {
         LLFloater::reshape(width, height, called_from_parent);
@@ -287,7 +297,7 @@ void LLModalDialog::onAppFocusLost()
 
                 if( gFocusMgr.childHasKeyboardFocus( instance ) )
                 {
-                        gFocusMgr.setKeyboardFocus( NULL, NULL );
+                        gFocusMgr.setKeyboardFocus( NULL );
                 }
         }
 }