aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llpaneldisplay.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/llpaneldisplay.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/llpaneldisplay.cpp')
-rw-r--r--linden/indra/newview/llpaneldisplay.cpp14
1 files changed, 4 insertions, 10 deletions
diff --git a/linden/indra/newview/llpaneldisplay.cpp b/linden/indra/newview/llpaneldisplay.cpp
index d510775..035b43f 100644
--- a/linden/indra/newview/llpaneldisplay.cpp
+++ b/linden/indra/newview/llpaneldisplay.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,
@@ -730,15 +731,8 @@ void LLPanelDisplay::onOpenHelp(void* user_data)
730 LLPanelDisplay* self = static_cast<LLPanelDisplay*>(user_data); 731 LLPanelDisplay* self = static_cast<LLPanelDisplay*>(user_data);
731 732
732 const char* xml_alert = "GraphicsPreferencesHelp"; 733 const char* xml_alert = "GraphicsPreferencesHelp";
733 LLAlertDialog* dialogp = gViewerWindow->alertXml(xml_alert); 734 LLFloater* parent_floater = gFloaterView->getParentFloater(self);
734 if (dialogp) 735 LLNotifications::instance().add(parent_floater->contextualNotification(xml_alert));
735 {
736 LLFloater* root_floater = gFloaterView->getParentFloater(self);
737 if (root_floater)
738 {
739 root_floater->addDependentFloater(dialogp);
740 }
741 }
742} 736}
743 737
744void LLPanelDisplay::onOpenHardwareSettings(void* user_data) 738void LLPanelDisplay::onOpenHardwareSettings(void* user_data)