diff options
| author | Jacek Antonelli | 2009-11-18 03:37:22 -0600 |
|---|---|---|
| committer | Jacek Antonelli | 2009-11-18 03:44:07 -0600 |
| commit | 5c2315db48750b0421b9bc84962c27a5c9d13388 (patch) | |
| tree | e3716f9d98159143003757d36cd57664370e4d68 /linden/indra/llwindow | |
| parent | Removed prepackaged libstdc++ (Linux only). Fixes VWR-12404. (diff) | |
| download | meta-impy-5c2315db48750b0421b9bc84962c27a5c9d13388.zip meta-impy-5c2315db48750b0421b9bc84962c27a5c9d13388.tar.gz meta-impy-5c2315db48750b0421b9bc84962c27a5c9d13388.tar.bz2 meta-impy-5c2315db48750b0421b9bc84962c27a5c9d13388.tar.xz | |
VWR-12620: Linux compile fails with -O2 (--type=Release)
Patch by Alissa Sabre.
Diffstat (limited to 'linden/indra/llwindow')
| -rw-r--r-- | linden/indra/llwindow/llwindowsdl.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/linden/indra/llwindow/llwindowsdl.cpp b/linden/indra/llwindow/llwindowsdl.cpp index 5209e6f..c3427d6 100644 --- a/linden/indra/llwindow/llwindowsdl.cpp +++ b/linden/indra/llwindow/llwindowsdl.cpp | |||
| @@ -2273,6 +2273,7 @@ BOOL LLWindowSDL::dialog_color_picker ( F32 *r, F32 *g, F32 *b) | |||
| 2273 | GtkColorSelection *colorsel = GTK_COLOR_SELECTION (GTK_COLOR_SELECTION_DIALOG(win)->colorsel); | 2273 | GtkColorSelection *colorsel = GTK_COLOR_SELECTION (GTK_COLOR_SELECTION_DIALOG(win)->colorsel); |
| 2274 | 2274 | ||
| 2275 | GdkColor color, orig_color; | 2275 | GdkColor color, orig_color; |
| 2276 | orig_color.pixel = 0; | ||
| 2276 | orig_color.red = guint16(65535 * *r); | 2277 | orig_color.red = guint16(65535 * *r); |
| 2277 | orig_color.green= guint16(65535 * *g); | 2278 | orig_color.green= guint16(65535 * *g); |
| 2278 | orig_color.blue = guint16(65535 * *b); | 2279 | orig_color.blue = guint16(65535 * *b); |