diff options
| author | Christian Goetze <cg@lindenlab.com> | 2009-03-13 21:28:40 +0000 |
|---|---|---|
| committer | Christian Goetze <cg@lindenlab.com> | 2009-03-13 21:28:40 +0000 |
| commit | 1aa0416aef379bb3ad1012441588b6d7fab81b40 (patch) | |
| tree | 14a247470bd0d508aba923dc00e940b961d304da /indra/llwindow/llwindowwin32.h | |
| parent | 7573288ab3ede23f97bff2f5caefcb622e7e9842 (diff) | |
svn merge -r114093:114412 svn+ssh://svn.lindenlab.com/svn/linden/branches/featurettes/featurettes-batch5-merge
Melinda (coco): 5th and final batch of featurettes. My work here is done.
Diffstat (limited to 'indra/llwindow/llwindowwin32.h')
| -rw-r--r-- | indra/llwindow/llwindowwin32.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llwindow/llwindowwin32.h b/indra/llwindow/llwindowwin32.h index 7495dcbf7a..237f834318 100644 --- a/indra/llwindow/llwindowwin32.h +++ b/indra/llwindow/llwindowwin32.h @@ -112,7 +112,7 @@ public: /*virtual*/ void interruptLanguageTextInput(); /*virtual*/ void spawnWebBrowser(const std::string& escaped_url); - static std::string getFontListSans(); + static std::vector<std::string> getDynamicFallbackFontList(); protected: LLWindowWin32( |