diff options
| author | Adam Moss <moss@lindenlab.com> | 2009-04-16 23:45:35 +0000 |
|---|---|---|
| committer | Adam Moss <moss@lindenlab.com> | 2009-04-16 23:45:35 +0000 |
| commit | b01c75cb423f07a3d3354f8bd62f265f80062b3b (patch) | |
| tree | dec1b220c24a60cc220d1cb07fd3545610644f0a /indra/newview/llfilepicker.h | |
| parent | 868250bdd74f348557102c0d8408d9bec30331f6 (diff) | |
svn merge -r117314:117337
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1
QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge
Diffstat (limited to 'indra/newview/llfilepicker.h')
| -rw-r--r-- | indra/newview/llfilepicker.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llfilepicker.h b/indra/newview/llfilepicker.h index 104e0df293..ab2455620f 100644 --- a/indra/newview/llfilepicker.h +++ b/indra/newview/llfilepicker.h @@ -59,6 +59,7 @@ #include <commdlg.h> #endif +extern "C" { // mostly for Linux, possible on others #if LL_GTK # include "gtk/gtk.h" @@ -68,6 +69,7 @@ #if LL_X11 #include "SDL/SDL_syswm.h" #endif +} class LLFilePicker { |