diff options
| author | Robin Cornelius | 2010-10-10 21:53:54 +0100 |
|---|---|---|
| committer | Robin Cornelius | 2010-10-10 21:53:54 +0100 |
| commit | c0034c520c6e61b64822e276316651ec6912bd98 (patch) | |
| tree | 910442027b6a2c1406d80ca93949755b54badf5c /linden/indra/llwindow/llwindowmacosx.h | |
| parent | Use all those cores for compile (diff) | |
| parent | Thickbrick Sleaford, Soft Linden: STORM-164 make gcc-4.4 happy about llvosky.h (diff) | |
| download | meta-impy-c0034c520c6e61b64822e276316651ec6912bd98.zip meta-impy-c0034c520c6e61b64822e276316651ec6912bd98.tar.gz meta-impy-c0034c520c6e61b64822e276316651ec6912bd98.tar.bz2 meta-impy-c0034c520c6e61b64822e276316651ec6912bd98.tar.xz | |
Merge branch 'mccabe-plugins' into plugins_merge
Conflicts:
linden/doc/contributions.txt
linden/indra/cmake/GStreamer.cmake
linden/indra/cmake/LLMedia.cmake
linden/indra/cmake/OPENAL.cmake
linden/indra/llmedia/CMakeLists.txt
linden/indra/llprimitive/material_codes.h
linden/indra/newview/chatbar_as_cmdline.cpp
linden/indra/newview/llappviewer.cpp
linden/indra/newview/llfloatertos.cpp
linden/indra/newview/llstartup.cpp
linden/indra/newview/llviewerwindow.cpp
linden/indra/newview/llvoavatar.cpp
linden/indra/newview/pipeline.cpp
linden/indra/newview/pipeline.h
linden/indra/newview/viewer_manifest.py
linden/install.xml
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/llwindow/llwindowmacosx.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/linden/indra/llwindow/llwindowmacosx.h b/linden/indra/llwindow/llwindowmacosx.h index 9e87e9f..92c73e8 100644 --- a/linden/indra/llwindow/llwindowmacosx.h +++ b/linden/indra/llwindow/llwindowmacosx.h | |||
| @@ -117,6 +117,10 @@ public: | |||
| 117 | 117 | ||
| 118 | static std::vector<std::string> getDynamicFallbackFontList(); | 118 | static std::vector<std::string> getDynamicFallbackFontList(); |
| 119 | 119 | ||
| 120 | // Provide native key event data | ||
| 121 | /*virtual*/ LLSD getNativeKeyData(); | ||
| 122 | |||
| 123 | |||
| 120 | protected: | 124 | protected: |
| 121 | LLWindowMacOSX( | 125 | LLWindowMacOSX( |
| 122 | const std::string& title, const std::string& name, int x, int y, int width, int height, U32 flags, | 126 | const std::string& title, const std::string& name, int x, int y, int width, int height, U32 flags, |