aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloaterdaycycle.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2009-04-30 13:04:20 -0500
committerJacek Antonelli2009-04-30 13:07:16 -0500
commitca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e (patch)
tree8348301d0ac44a524f1819b777686bf086907d76 /linden/indra/newview/llfloaterdaycycle.cpp
parentSecond Life viewer sources 1.22.11 (diff)
downloadmeta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.zip
meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.gz
meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.bz2
meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.xz
Second Life viewer sources 1.23.0-RC
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llfloaterdaycycle.cpp15
1 files changed, 4 insertions, 11 deletions
diff --git a/linden/indra/newview/llfloaterdaycycle.cpp b/linden/indra/newview/llfloaterdaycycle.cpp
index 07e3738..58876a8 100644
--- a/linden/indra/newview/llfloaterdaycycle.cpp
+++ b/linden/indra/newview/llfloaterdaycycle.cpp
@@ -17,7 +17,8 @@
17 * There are special exceptions to the terms and conditions of the GPL as 17 * There are special exceptions to the terms and conditions of the GPL as
18 * it is applied to this Source Code. View the full text of the exception 18 * it is applied to this Source Code. View the full text of the exception
19 * in the file doc/FLOSS-exception.txt in this software distribution, or 19 * in the file doc/FLOSS-exception.txt in this software distribution, or
20 * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception 20 * online at
21 * http://secondlifegrid.net/programs/open_source/licensing/flossexception
21 * 22 *
22 * By copying, modifying or distributing this software, you acknowledge 23 * By copying, modifying or distributing this software, you acknowledge
23 * that you have read and understood your obligations described above, 24 * that you have read and understood your obligations described above,
@@ -98,17 +99,9 @@ LLFloaterDayCycle::~LLFloaterDayCycle()
98void LLFloaterDayCycle::onClickHelp(void* data) 99void LLFloaterDayCycle::onClickHelp(void* data)
99{ 100{
100 LLFloaterDayCycle* self = LLFloaterDayCycle::instance(); 101 LLFloaterDayCycle* self = LLFloaterDayCycle::instance();
101 const std::string* xml_alert = (std::string*)data;
102 102
103 LLAlertDialog* dialogp = gViewerWindow->alertXml(*xml_alert); 103 std::string xml_alert = *(std::string *) data;
104 if (dialogp) 104 LLNotifications::instance().add(self->contextualNotification(xml_alert));
105 {
106 LLFloater* root_floater = gFloaterView->getParentFloater(self);
107 if (root_floater)
108 {
109 root_floater->addDependentFloater(dialogp);
110 }
111 }
112} 105}
113 106
114void LLFloaterDayCycle::initHelpBtn(const std::string& name, const std::string& xml_alert) 107void LLFloaterDayCycle::initHelpBtn(const std::string& name, const std::string& xml_alert)