diff options
author | Richard Linden <none@none> | 2012-05-21 17:16:34 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2012-05-21 17:16:34 -0700 |
commit | 723f596bf6f2fac2c24360790024ec3a4e778793 (patch) | |
tree | 1153ec6b49f00783499af3c1e6af58fe1de86409 /indra/newview/lltoastnotifypanel.cpp | |
parent | 32717690ee6a9f33ca909f0df0226e9533f69399 (diff) | |
parent | 61bc25211be31ad28b8ae342c17b4ea1c32d955c (diff) |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-chui
Diffstat (limited to 'indra/newview/lltoastnotifypanel.cpp')
-rw-r--r-- | indra/newview/lltoastnotifypanel.cpp | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/indra/newview/lltoastnotifypanel.cpp b/indra/newview/lltoastnotifypanel.cpp index 3692fd5672..97b43d6197 100644 --- a/indra/newview/lltoastnotifypanel.cpp +++ b/indra/newview/lltoastnotifypanel.cpp @@ -60,19 +60,6 @@ LLToastNotifyPanel::LLToastNotifyPanel(const LLNotificationPtr& notification, co LLInstanceTracker<LLToastNotifyPanel, LLUUID>(notification->getID()) { init(rect, show_images); - - - //if(notification->isRespondedTo()) - //{ - // // User selected an option in toast, now disable required buttons in IM window - // disableRespondedOptions(notification); - //} - // - //if(notification->isReusable()) - //{ - // mButtonClickConnection = sButtonClickSignal.connect( - // boost::bind(&LLToastNotifyPanel::disableRespondedOptions, this, notification)); - //} } void LLToastNotifyPanel::addDefaultButton() { @@ -355,17 +342,6 @@ void LLToastNotifyPanel::onClickButton(void* data) response[button_name] = true; } - bool is_reusable = self->mNotification->isReusable(); - // When we call respond(), LLOfferInfo will delete itself in inventory_offer_callback(), - // lets copy it while it's still valid. - LLOfferInfo* old_info = static_cast<LLOfferInfo*>(self->mNotification->getResponder()); - LLOfferInfo* new_info = NULL; - if(is_reusable && old_info) - { - new_info = new LLOfferInfo(*old_info); - self->mNotification->setResponder(new_info); - } - // disable all buttons self->mControlPanel->setEnabled(FALSE); |