diff options
| author | James Cook <james@lindenlab.com> | 2009-10-07 20:54:31 +0000 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-10-07 20:54:31 +0000 |
| commit | ec84b639ed71c1dac8457867148d8aea6d595685 (patch) | |
| tree | 71f46df7991cff5a9e9cf500c9b3c339d84a2637 /indra/newview/llfloateruipreview.cpp | |
| parent | ec278c9dfb71d9ccebacc858240a08d02c758b88 (diff) | |
EXT-1339 Create onClose method in LLFloater, and remove most bindings to mCloseSignal. In the vast majority of cases, mCloseSignal is being bound to an onClose function. Just make it virtual and be done with it. Renamed a couple of LLPanel close methods to onClosePanel() to distinguish them. Reviewed with Richard.
Diffstat (limited to 'indra/newview/llfloateruipreview.cpp')
| -rw-r--r-- | indra/newview/llfloateruipreview.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/llfloateruipreview.cpp b/indra/newview/llfloateruipreview.cpp index 266252efea..98ca33c9cc 100644 --- a/indra/newview/llfloateruipreview.cpp +++ b/indra/newview/llfloateruipreview.cpp @@ -283,8 +283,6 @@ LLFloaterUIPreview::~LLFloaterUIPreview() // Perform post-build setup (defined in superclass) BOOL LLFloaterUIPreview::postBuild() { - mCloseSignal.connect(boost::bind(&LLFloaterUIPreview::onClose, this, _2)); - LLPanel* main_panel_tmp = getChild<LLPanel>("main_panel"); // get a pointer to the main panel in order to... mFileList = main_panel_tmp->getChild<LLScrollListCtrl>("name_list"); // save pointer to file list // Double-click opens the floater, for convenience @@ -442,9 +440,9 @@ void LLFloaterUIPreview::onClickExportSchema() // Close click handler -- delete my displayed floater if it exists -void LLFloaterUIPreview::onClose(const LLSD& app_quitting) +void LLFloaterUIPreview::onClose(bool app_quitting) { - if(!app_quitting.asBoolean() && mDisplayedFloater) + if(!app_quitting && mDisplayedFloater) { onClickCloseDisplayedFloater(PRIMARY_FLOATER); onClickCloseDisplayedFloater(SECONDARY_FLOATER); |