diff options
| author | Adam Moss <moss@lindenlab.com> | 2008-04-17 14:56:00 +0000 |
|---|---|---|
| committer | Adam Moss <moss@lindenlab.com> | 2008-04-17 14:56:00 +0000 |
| commit | 669d1162f4c7529296d7018ec65960f120cc1c3e (patch) | |
| tree | 807a035b4ee593587923e040b49bd5a6a8dc42cf /indra/llwindow/llwindowsdl.h | |
| parent | a3f3ab7e113e44309461b26399d627814f0ce4f9 (diff) | |
QAR-460 Automatic XUI selection & Kick-ass Linux Fonts MergeMe
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@84983
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/fontconfig-merge1
Diffstat (limited to 'indra/llwindow/llwindowsdl.h')
| -rw-r--r-- | indra/llwindow/llwindowsdl.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llwindow/llwindowsdl.h b/indra/llwindow/llwindowsdl.h index 51d34eb96f..58bb93bbc7 100644 --- a/indra/llwindow/llwindowsdl.h +++ b/indra/llwindow/llwindowsdl.h @@ -120,6 +120,8 @@ public: /*virtual*/ void *getPlatformWindow(); /*virtual*/ void bringToFront(); + static std::string getFontListSans(); + // Not great that these are public, but they have to be accessible // by non-class code and it's better than making them global. #if LL_X11 @@ -154,7 +156,6 @@ protected: BOOL shouldPostQuit() { return mPostQuit; } - protected: // // Platform specific methods |