diff options
| author | Kent Quirk <q@lindenlab.com> | 2009-01-05 18:59:12 +0000 |
|---|---|---|
| committer | Kent Quirk <q@lindenlab.com> | 2009-01-05 18:59:12 +0000 |
| commit | 667ca55bad0108c4bdf8f007b89e1a52fc766aad (patch) | |
| tree | 7bd62ac8d9af079c3994565f3f200ccc250bbc28 /indra/newview/llfloaterdaycycle.cpp | |
| parent | 95f365789f4cebc7bd97ccefd538f14d481a8373 (diff) | |
svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk.
Diffstat (limited to 'indra/newview/llfloaterdaycycle.cpp')
| -rw-r--r-- | indra/newview/llfloaterdaycycle.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/indra/newview/llfloaterdaycycle.cpp b/indra/newview/llfloaterdaycycle.cpp index af42a92ed8..de308b5425 100644 --- a/indra/newview/llfloaterdaycycle.cpp +++ b/indra/newview/llfloaterdaycycle.cpp @@ -98,17 +98,9 @@ LLFloaterDayCycle::~LLFloaterDayCycle() void LLFloaterDayCycle::onClickHelp(void* data) { LLFloaterDayCycle* self = LLFloaterDayCycle::instance(); - const std::string* xml_alert = (std::string*)data; - LLAlertDialog* dialogp = gViewerWindow->alertXml(*xml_alert); - if (dialogp) - { - LLFloater* root_floater = gFloaterView->getParentFloater(self); - if (root_floater) - { - root_floater->addDependentFloater(dialogp); - } - } + std::string xml_alert = *(std::string *) data; + LLNotifications::instance().add(self->contextualNotification(xml_alert)); } void LLFloaterDayCycle::initHelpBtn(const std::string& name, const std::string& xml_alert) |