diff options
| author | Jacek Antonelli | 2009-10-13 20:20:37 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2009-10-13 20:20:37 -0500 |
| commit | 20235c92e6e0deddf3c8582bbed75361e24ecc0d (patch) | |
| tree | 754db362c0ad8060ceaa3ed24059e320f4b13f5c /linden/indra/llwindow/llwindowwin32.h | |
| parent | Merge remote branch 'mccabe/next' into next (diff) | |
| parent | Added history button for group chat as well (diff) | |
| download | meta-impy-20235c92e6e0deddf3c8582bbed75361e24ecc0d.zip meta-impy-20235c92e6e0deddf3c8582bbed75361e24ecc0d.tar.gz meta-impy-20235c92e6e0deddf3c8582bbed75361e24ecc0d.tar.bz2 meta-impy-20235c92e6e0deddf3c8582bbed75361e24ecc0d.tar.xz | |
Merge remote branch 'mccabe/next' into next
Diffstat (limited to 'linden/indra/llwindow/llwindowwin32.h')
| -rw-r--r-- | linden/indra/llwindow/llwindowwin32.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/linden/indra/llwindow/llwindowwin32.h b/linden/indra/llwindow/llwindowwin32.h index 795fc79..bea55c6 100644 --- a/linden/indra/llwindow/llwindowwin32.h +++ b/linden/indra/llwindow/llwindowwin32.h | |||
| @@ -110,6 +110,7 @@ public: | |||
| 110 | /*virtual*/ void updateLanguageTextInputArea(); | 110 | /*virtual*/ void updateLanguageTextInputArea(); |
| 111 | /*virtual*/ void interruptLanguageTextInput(); | 111 | /*virtual*/ void interruptLanguageTextInput(); |
| 112 | /*virtual*/ void spawnWebBrowser(const std::string& escaped_url); | 112 | /*virtual*/ void spawnWebBrowser(const std::string& escaped_url); |
| 113 | /*virtual*/ void ShellEx(const std::string& command); | ||
| 113 | 114 | ||
| 114 | static std::string getFontListSans(); | 115 | static std::string getFontListSans(); |
| 115 | 116 | ||