diff options
author | McCabe Maxsted | 2009-10-18 17:58:27 -0700 |
---|---|---|
committer | McCabe Maxsted | 2009-10-18 17:58:27 -0700 |
commit | e4b0e7c82d670081c071d8a3da31b5ec407b8e07 (patch) | |
tree | 9410962bbb582eedbec448139e217f2714050777 /linden/indra/llwindow/llwindowwin32.h | |
parent | Started 1.3.0 branch (diff) | |
parent | Updated and added some Linux libs. (diff) | |
download | meta-impy-e4b0e7c82d670081c071d8a3da31b5ec407b8e07.zip meta-impy-e4b0e7c82d670081c071d8a3da31b5ec407b8e07.tar.gz meta-impy-e4b0e7c82d670081c071d8a3da31b5ec407b8e07.tar.bz2 meta-impy-e4b0e7c82d670081c071d8a3da31b5ec407b8e07.tar.xz |
Merged working branch of 1.2 into LL 1.23 merge
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 237f834..d3ae325 100644 --- a/linden/indra/llwindow/llwindowwin32.h +++ b/linden/indra/llwindow/llwindowwin32.h | |||
@@ -111,6 +111,7 @@ public: | |||
111 | /*virtual*/ void updateLanguageTextInputArea(); | 111 | /*virtual*/ void updateLanguageTextInputArea(); |
112 | /*virtual*/ void interruptLanguageTextInput(); | 112 | /*virtual*/ void interruptLanguageTextInput(); |
113 | /*virtual*/ void spawnWebBrowser(const std::string& escaped_url); | 113 | /*virtual*/ void spawnWebBrowser(const std::string& escaped_url); |
114 | /*virtual*/ void ShellEx(const std::string& command); | ||
114 | 115 | ||
115 | static std::vector<std::string> getDynamicFallbackFontList(); | 116 | static std::vector<std::string> getDynamicFallbackFontList(); |
116 | 117 | ||