svn merge -r 77416:78126 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-0-Viewer_abandoned -> release

2 files changed, 12 insertions, 0 deletions

diff --git a/indra/llui/llmodaldialog.cpp b/indra/llui/llmodaldialog.cpp
index ca8020fe70..af14ec418f 100644
--- a/indra/llui/llmodaldialog.cpp
+++ b/indra/llui/llmodaldialog.cpp
@@ -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);
diff --git a/indra/llui/llmodaldialog.h b/indra/llui/llmodaldialog.h
index 2355861f04..dcd5644f60 100644
--- a/indra/llui/llmodaldialog.h
+++ b/indra/llui/llmodaldialog.h
@@ -47,6 +47,8 @@ public:
 	LLModalDialog( const LLString& title, S32 width, S32 height, BOOL modal = true );
 	/*virtual*/ ~LLModalDialog();
 
+	/*virtual*/ void	open();	/* Flawfinder: ignore */
+	
 	/*virtual*/ void 	reshape(S32 width, S32 height, BOOL called_from_parent = 1);
 	
 	/*virtual*/ void	startModal();