aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloaterenvsettings.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/llfloaterenvsettings.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 'linden/indra/newview/llfloaterenvsettings.cpp')
-rw-r--r--linden/indra/newview/llfloaterenvsettings.cpp17
1 files changed, 4 insertions, 13 deletions
diff --git a/linden/indra/newview/llfloaterenvsettings.cpp b/linden/indra/newview/llfloaterenvsettings.cpp
index 4162165..661c398 100644
--- a/linden/indra/newview/llfloaterenvsettings.cpp
+++ b/linden/indra/newview/llfloaterenvsettings.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,
@@ -67,18 +68,8 @@ LLFloaterEnvSettings::~LLFloaterEnvSettings()
67 68
68void LLFloaterEnvSettings::onClickHelp(void* data) 69void LLFloaterEnvSettings::onClickHelp(void* data)
69{ 70{
70 LLFloaterEnvSettings* self = static_cast<LLFloaterEnvSettings*>(data); 71 LLFloaterEnvSettings* self = (LLFloaterEnvSettings*)data;
71 72 LLNotifications::instance().add(self->contextualNotification("EnvSettingsHelpButton"));
72 const char* xml_alert = "EnvSettingsHelpButton";
73 LLAlertDialog* dialogp = gViewerWindow->alertXml(xml_alert);
74 if (dialogp)
75 {
76 LLFloater* root_floater = gFloaterView->getParentFloater(self);
77 if (root_floater)
78 {
79 root_floater->addDependentFloater(dialogp);
80 }
81 }
82} 73}
83 74
84void LLFloaterEnvSettings::initCallbacks(void) 75void LLFloaterEnvSettings::initCallbacks(void)