diff options
| author | David Seikel | 2011-02-20 17:43:37 +1000 |
|---|---|---|
| committer | David Seikel | 2011-02-20 17:43:37 +1000 |
| commit | 30cac27887ad0497168efb7d8dbc4209ee8b6a2f (patch) | |
| tree | e722eeffe993a85552ca31e83c24cff8c1d9e339 /linden/indra/newview/llfloaterdirectory.cpp | |
| parent | Work around the endless bitching about webkit failing when you open the searc... (diff) | |
| parent | Fixed compile error in llmediaplugintest: lingering ll_init_apr (diff) | |
| download | meta-impy-30cac27887ad0497168efb7d8dbc4209ee8b6a2f.zip meta-impy-30cac27887ad0497168efb7d8dbc4209ee8b6a2f.tar.gz meta-impy-30cac27887ad0497168efb7d8dbc4209ee8b6a2f.tar.bz2 meta-impy-30cac27887ad0497168efb7d8dbc4209ee8b6a2f.tar.xz | |
Merge remote-tracking branch 'mccabe/weekly' into weekly
Diffstat (limited to 'linden/indra/newview/llfloaterdirectory.cpp')
| -rw-r--r-- | linden/indra/newview/llfloaterdirectory.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/linden/indra/newview/llfloaterdirectory.cpp b/linden/indra/newview/llfloaterdirectory.cpp index 8018c31..7c8ddf1 100644 --- a/linden/indra/newview/llfloaterdirectory.cpp +++ b/linden/indra/newview/llfloaterdirectory.cpp | |||
| @@ -466,7 +466,9 @@ void LLFloaterDirectory::setVisible(BOOL visible) | |||
| 466 | 466 | ||
| 467 | void LLFloaterDirectory::onClose(bool app_quitting) | 467 | void LLFloaterDirectory::onClose(bool app_quitting) |
| 468 | { | 468 | { |
| 469 | setVisible(FALSE); | 469 | LLFloater::onClose(app_quitting); |
| 470 | |||
| 471 | //setVisible(FALSE); //meaning you hide 3 web browsers - one SLPlugin each | ||
| 470 | } | 472 | } |
| 471 | 473 | ||
| 472 | // static | 474 | // static |