aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llwindow/llwindowwin32.h
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/llwindow/llwindowwin32.h')
-rw-r--r--linden/indra/llwindow/llwindowwin32.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/linden/indra/llwindow/llwindowwin32.h b/linden/indra/llwindow/llwindowwin32.h
index bea55c6..d3ae325 100644
--- a/linden/indra/llwindow/llwindowwin32.h
+++ b/linden/indra/llwindow/llwindowwin32.h
@@ -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,
@@ -112,7 +113,7 @@ public:
112 /*virtual*/ void spawnWebBrowser(const std::string& escaped_url); 113 /*virtual*/ void spawnWebBrowser(const std::string& escaped_url);
113 /*virtual*/ void ShellEx(const std::string& command); 114 /*virtual*/ void ShellEx(const std::string& command);
114 115
115 static std::string getFontListSans(); 116 static std::vector<std::string> getDynamicFallbackFontList();
116 117
117protected: 118protected:
118 LLWindowWin32( 119 LLWindowWin32(