diff options
| author | Adam Moss <moss@lindenlab.com> | 2007-02-12 17:20:51 +0000 |
|---|---|---|
| committer | Adam Moss <moss@lindenlab.com> | 2007-02-12 17:20:51 +0000 |
| commit | d1daa178599ac6320be641258931417bc2dd8b0e (patch) | |
| tree | 68b5481c834d10bf530b3e2c157fb7fc34d307f3 /indra/newview | |
| parent | 5cc44523f79b6cf495d2649fce9bf9e5181787e8 (diff) | |
Landing embedded Mozilla support for the Linux Client.
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@57782
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/linuxmozilla-r57782base
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/linux_tools/wrapper.sh | 2 | ||||
| -rw-r--r-- | indra/newview/llfilepicker.cpp | 16 |
2 files changed, 10 insertions, 8 deletions
diff --git a/indra/newview/linux_tools/wrapper.sh b/indra/newview/linux_tools/wrapper.sh index 222ce98c73..fd571cacfd 100755 --- a/indra/newview/linux_tools/wrapper.sh +++ b/indra/newview/linux_tools/wrapper.sh @@ -38,7 +38,7 @@ export SDL_VIDEO_X11_DGAMOUSE=0 RUN_PATH=`dirname "$0" || echo .` cd "${RUN_PATH}" -LD_LIBRARY_PATH="`pwd`"/lib:"${LD_LIBRARY_PATH}" bin/do-not-directly-run-secondlife-bin `cat gridargs.dat` $@ | cat +LD_LIBRARY_PATH="`pwd`"/lib:"`pwd`"/app_settings/mozilla:"${LD_LIBRARY_PATH}" bin/do-not-directly-run-secondlife-bin `cat gridargs.dat` $@ | cat echo echo '*********************************************************' diff --git a/indra/newview/llfilepicker.cpp b/indra/newview/llfilepicker.cpp index 9d698931b0..98bbf23502 100644 --- a/indra/newview/llfilepicker.cpp +++ b/indra/newview/llfilepicker.cpp @@ -17,6 +17,10 @@ #include "lldir.h" #include "llframetimer.h" +#if LL_SDL +#include "llwindowsdl.h" // for some X/GTK utils to help with filepickers +#endif // LL_SDL + // // Globals // @@ -954,8 +958,7 @@ static void store_filenames(GtkWidget *widget, gpointer user_data) { GtkWindow* LLFilePicker::buildFilePicker(void) { - gtk_disable_setlocale(); - if (gtk_init_check(NULL, NULL) && + if (ll_try_gtk_init() && ! gViewerWindow->getWindow()->getFullscreen()) { GtkWidget *win = NULL; @@ -967,18 +970,17 @@ GtkWindow* LLFilePicker::buildFilePicker(void) // Make GTK tell the window manager to associate this // dialog with our non-GTK raw X11 window, which should try // to keep it on top etc. - Window *XWindowID_ptr = (Window*) gViewerWindow-> - getWindow()->getPlatformWindow(); - if (XWindowID_ptr && None != *XWindowID_ptr) + Window XWindowID = get_SDL_XWindowID(); + if (None != XWindowID) { gtk_widget_realize(GTK_WIDGET(win)); // so we can get its gdkwin - GdkWindow *gdkwin = gdk_window_foreign_new(*XWindowID_ptr); + GdkWindow *gdkwin = gdk_window_foreign_new(XWindowID); gdk_window_set_transient_for(GTK_WIDGET(win)->window, gdkwin); } else { - llwarns << "Hmm, couldn't get xwid from LLWindow." << llendl; + llwarns << "Hmm, couldn't get xwid to use for transient." << llendl; } # endif //LL_X11 |