diff options
author | Jacek Antonelli | 2009-04-30 13:04:20 -0500 |
---|---|---|
committer | Jacek Antonelli | 2009-04-30 13:07:16 -0500 |
commit | ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e (patch) | |
tree | 8348301d0ac44a524f1819b777686bf086907d76 /linden/indra/newview/llfloaterabout.cpp | |
parent | Second Life viewer sources 1.22.11 (diff) | |
download | meta-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/llfloaterabout.cpp')
-rw-r--r-- | linden/indra/newview/llfloaterabout.cpp | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/linden/indra/newview/llfloaterabout.cpp b/linden/indra/newview/llfloaterabout.cpp index 19b7653..2652387 100644 --- a/linden/indra/newview/llfloaterabout.cpp +++ b/linden/indra/newview/llfloaterabout.cpp | |||
@@ -18,7 +18,8 @@ | |||
18 | * There are special exceptions to the terms and conditions of the GPL as | 18 | * There are special exceptions to the terms and conditions of the GPL as |
19 | * it is applied to this Source Code. View the full text of the exception | 19 | * it is applied to this Source Code. View the full text of the exception |
20 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 20 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
21 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception | 21 | * online at |
22 | * http://secondlifegrid.net/programs/open_source/licensing/flossexception | ||
22 | * | 23 | * |
23 | * By copying, modifying or distributing this software, you acknowledge | 24 | * By copying, modifying or distributing this software, you acknowledge |
24 | * that you have read and understood your obligations described above, | 25 | * that you have read and understood your obligations described above, |
@@ -116,11 +117,19 @@ LLFloaterAbout::LLFloaterAbout() | |||
116 | __DATE__, __TIME__, | 117 | __DATE__, __TIME__, |
117 | gSavedSettings.getString("VersionChannelName").c_str()); | 118 | gSavedSettings.getString("VersionChannelName").c_str()); |
118 | support_widget->appendColoredText(version, FALSE, FALSE, gColors.getColor("TextFgReadOnlyColor")); | 119 | support_widget->appendColoredText(version, FALSE, FALSE, gColors.getColor("TextFgReadOnlyColor")); |
119 | support_widget->appendStyledText(LLTrans::getString("ReleaseNotes"), FALSE, FALSE, &viewer_link_style); | 120 | support_widget->appendStyledText(LLTrans::getString("ReleaseNotes"), false, false, viewer_link_style); |
120 | 121 | ||
121 | std::string support; | 122 | std::string support; |
122 | support.append("\n\n"); | 123 | support.append("\n\n"); |
123 | 124 | ||
125 | #if LL_MSVC | ||
126 | support.append(llformat("Built with MSVC version %d\n\n", _MSC_VER)); | ||
127 | #endif | ||
128 | |||
129 | #if LL_GNUC | ||
130 | support.append(llformat("Built with GCC version %d\n\n", GCC_VERSION)); | ||
131 | #endif | ||
132 | |||
124 | // Position | 133 | // Position |
125 | LLViewerRegion* region = gAgent.getRegion(); | 134 | LLViewerRegion* region = gAgent.getRegion(); |
126 | if (region) | 135 | if (region) |
@@ -152,7 +161,7 @@ LLFloaterAbout::LLFloaterAbout() | |||
152 | support.append("\n"); | 161 | support.append("\n"); |
153 | 162 | ||
154 | support_widget->appendColoredText(support, FALSE, FALSE, gColors.getColor("TextFgReadOnlyColor")); | 163 | support_widget->appendColoredText(support, FALSE, FALSE, gColors.getColor("TextFgReadOnlyColor")); |
155 | support_widget->appendStyledText(LLTrans::getString("ReleaseNotes"), FALSE, FALSE, &server_link_style); | 164 | support_widget->appendStyledText(LLTrans::getString("ReleaseNotes"), false, false, server_link_style); |
156 | 165 | ||
157 | support = "\n\n"; | 166 | support = "\n\n"; |
158 | } | 167 | } |