summaryrefslogtreecommitdiff
path: root/indra/newview/lluploaddialog.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-03-09 13:19:46 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-03-09 13:19:46 +0000
commitd0d1534e34a544a2a2acc9993421f587bb4f6ede (patch)
tree99eb3d9b83bcbcaaedf3413aa2eecbf3cf329fbe /indra/newview/lluploaddialog.cpp
parentdf50590145a835531a9539a96e8349f910161f53 (diff)
parent7b029036339ae1770307ff33ccd5d540e2618748 (diff)
merge from viewer-2-0
Diffstat (limited to 'indra/newview/lluploaddialog.cpp')
-rw-r--r--indra/newview/lluploaddialog.cpp2
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)