summaryrefslogtreecommitdiff
path: root/indra/newview/lluploaddialog.cpp
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2010-03-09 19:43:11 +0200
committerVadim Savchuk <vsavchuk@productengine.com>2010-03-09 19:43:11 +0200
commitcbbddc8eaa694d7a8e37d188350fcb6ca88124fe (patch)
tree4f583ff144e637560c88069ef79d199d9b449686 /indra/newview/lluploaddialog.cpp
parentb513811c7be5e4d71dfc2c2a8d07e738c990293a (diff)
parentcaa1435ae0afa0e4ac2fe42fc8dc67dd93cdb524 (diff)
Merge from default branch
--HG-- branch : product-engine
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)