aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llwindow/llwindowsdl.h
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:50 -0500
committerJacek Antonelli2008-08-15 23:45:50 -0500
commit2a4dea528f670b9bb1f77ef27a8a1dd16603d114 (patch)
tree95c68e362703c9099d571ecbdc6142b1cda1e005 /linden/indra/llwindow/llwindowsdl.h
parentSecond Life viewer sources 1.20.6 (diff)
downloadmeta-impy-2a4dea528f670b9bb1f77ef27a8a1dd16603d114.zip
meta-impy-2a4dea528f670b9bb1f77ef27a8a1dd16603d114.tar.gz
meta-impy-2a4dea528f670b9bb1f77ef27a8a1dd16603d114.tar.bz2
meta-impy-2a4dea528f670b9bb1f77ef27a8a1dd16603d114.tar.xz
Second Life viewer sources 1.20.7
Diffstat (limited to 'linden/indra/llwindow/llwindowsdl.h')
-rw-r--r--linden/indra/llwindow/llwindowsdl.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/linden/indra/llwindow/llwindowsdl.h b/linden/indra/llwindow/llwindowsdl.h
index d1b2b77..5aed4e6 100644
--- a/linden/indra/llwindow/llwindowsdl.h
+++ b/linden/indra/llwindow/llwindowsdl.h
@@ -120,6 +120,8 @@ public:
120 /*virtual*/ void *getPlatformWindow(); 120 /*virtual*/ void *getPlatformWindow();
121 /*virtual*/ void bringToFront(); 121 /*virtual*/ void bringToFront();
122 122
123 static std::string getFontListSans();
124
123 // Not great that these are public, but they have to be accessible 125 // Not great that these are public, but they have to be accessible
124 // by non-class code and it's better than making them global. 126 // by non-class code and it's better than making them global.
125#if LL_X11 127#if LL_X11
@@ -154,7 +156,6 @@ protected:
154 156
155 BOOL shouldPostQuit() { return mPostQuit; } 157 BOOL shouldPostQuit() { return mPostQuit; }
156 158
157
158protected: 159protected:
159 // 160 //
160 // Platform specific methods 161 // Platform specific methods