diff options
Diffstat (limited to 'linden/indra/newview/llfilepicker.cpp')
-rw-r--r-- | linden/indra/newview/llfilepicker.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/llfilepicker.cpp b/linden/indra/newview/llfilepicker.cpp index 1edfbe6..caf79eb 100644 --- a/linden/indra/newview/llfilepicker.cpp +++ b/linden/indra/newview/llfilepicker.cpp | |||
@@ -4,7 +4,7 @@ | |||
4 | * | 4 | * |
5 | * $LicenseInfo:firstyear=2001&license=viewergpl$ | 5 | * $LicenseInfo:firstyear=2001&license=viewergpl$ |
6 | * | 6 | * |
7 | * Copyright (c) 2001-2008, Linden Research, Inc. | 7 | * Copyright (c) 2001-2009, Linden Research, Inc. |
8 | * | 8 | * |
9 | * Second Life Viewer Source Code | 9 | * Second Life Viewer Source Code |
10 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
@@ -962,7 +962,7 @@ void LLFilePicker::chooser_responder(GtkWidget *widget, gint response, gpointer | |||
962 | 962 | ||
963 | GtkWindow* LLFilePicker::buildFilePicker(bool is_save, bool is_folder, std::string context) | 963 | GtkWindow* LLFilePicker::buildFilePicker(bool is_save, bool is_folder, std::string context) |
964 | { | 964 | { |
965 | if (ll_try_gtk_init() && | 965 | if (LLWindowSDL::ll_try_gtk_init() && |
966 | ! gViewerWindow->getWindow()->getFullscreen()) | 966 | ! gViewerWindow->getWindow()->getFullscreen()) |
967 | { | 967 | { |
968 | GtkWidget *win = NULL; | 968 | GtkWidget *win = NULL; |
@@ -1003,7 +1003,7 @@ GtkWindow* LLFilePicker::buildFilePicker(bool is_save, bool is_folder, std::stri | |||
1003 | // Make GTK tell the window manager to associate this | 1003 | // Make GTK tell the window manager to associate this |
1004 | // dialog with our non-GTK raw X11 window, which should try | 1004 | // dialog with our non-GTK raw X11 window, which should try |
1005 | // to keep it on top etc. | 1005 | // to keep it on top etc. |
1006 | Window XWindowID = get_SDL_XWindowID(); | 1006 | Window XWindowID = LLWindowSDL::get_SDL_XWindowID(); |
1007 | if (None != XWindowID) | 1007 | if (None != XWindowID) |
1008 | { | 1008 | { |
1009 | gtk_widget_realize(GTK_WIDGET(win)); // so we can get its gdkwin | 1009 | gtk_widget_realize(GTK_WIDGET(win)); // so we can get its gdkwin |