diff options
author | skolb <none@none> | 2010-03-08 14:54:54 -0800 |
---|---|---|
committer | skolb <none@none> | 2010-03-08 14:54:54 -0800 |
commit | 78abe4f5ffb02e14cd98f049b8100d20a82f3b1c (patch) | |
tree | 0c471654bd00737375e91f040d758716c82bffb2 /indra/newview/lluploaddialog.cpp | |
parent | f39a87ef8384ede25a6597e678ac7609e9e64cc5 (diff) | |
parent | 2aa9ecb60235c96a42f3719fab9dbc6ea1bf50db (diff) |
Local merge
Diffstat (limited to 'indra/newview/lluploaddialog.cpp')
-rw-r--r-- | indra/newview/lluploaddialog.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lluploaddialog.cpp b/indra/newview/lluploaddialog.cpp index 577b5952e5..22c7d670f8 100644 --- a/indra/newview/lluploaddialog.cpp +++ b/indra/newview/lluploaddialog.cpp @@ -91,7 +91,7 @@ LLUploadDialog::LLUploadDialog( const std::string& msg) setMessage(msg); // The dialog view is a root view - gFocusMgr.setTopCtrl( this ); + gViewerWindow->addPopup(this); } void LLUploadDialog::setMessage( const std::string& msg) |