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/lltexturectrl.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/lltexturectrl.cpp')
| -rw-r--r-- | indra/newview/lltexturectrl.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp index 9fc91e2971..43f82e592b 100644 --- a/indra/newview/lltexturectrl.cpp +++ b/indra/newview/lltexturectrl.cpp @@ -102,15 +102,16 @@ public: virtual ~LLFloaterTexturePicker(); // LLView overrides - virtual BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, + /*virtual*/ BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDragAndDropType cargo_type, void *cargo_data, EAcceptance *accept, std::string& tooltip_msg); - virtual void draw(); - virtual BOOL handleKeyHere(KEY key, MASK mask); + /*virtual*/ void draw(); + /*virtual*/ BOOL handleKeyHere(KEY key, MASK mask); // LLFloater overrides - virtual BOOL postBuild(); + /*virtual*/ BOOL postBuild(); + /*virtual*/ void onClose(bool app_settings); // New functions void setImageID( const LLUUID& image_asset_id); @@ -130,7 +131,6 @@ public: void commitIfImmediateSet(); void onFilterEdit(const std::string& search_string ); - void onClose(); static void onBtnSetToDefault( void* userdata ); static void onBtnSelect( void* userdata ); @@ -369,7 +369,7 @@ BOOL LLFloaterTexturePicker::handleKeyHere(KEY key, MASK mask) return LLFloater::handleKeyHere(key, mask); } -void LLFloaterTexturePicker::onClose() +void LLFloaterTexturePicker::onClose(bool app_quitting) { if (mOwner) { @@ -381,8 +381,6 @@ void LLFloaterTexturePicker::onClose() // virtual BOOL LLFloaterTexturePicker::postBuild() { - mCloseSignal.connect(boost::bind(&LLFloaterTexturePicker::onClose, this)); - LLFloater::postBuild(); if (!mLabel.empty()) |