From 5c2315db48750b0421b9bc84962c27a5c9d13388 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Wed, 18 Nov 2009 03:37:22 -0600
Subject: VWR-12620: Linux compile fails with -O2 (--type=Release)

Patch by Alissa Sabre.
---
 linden/indra/llmessage/lltemplatemessagereader.cpp | 3 +--
 linden/indra/llwindow/llwindowsdl.cpp              | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'linden/indra')

diff --git a/linden/indra/llmessage/lltemplatemessagereader.cpp b/linden/indra/llmessage/lltemplatemessagereader.cpp
index 7a7d3bb..12ffcfa 100644
--- a/linden/indra/llmessage/lltemplatemessagereader.cpp
+++ b/linden/indra/llmessage/lltemplatemessagereader.cpp
@@ -675,8 +675,7 @@ BOOL LLTemplateMessageReader::decodeData(const U8* buffer, const LLHost& sender
 
 						// default to 0s.
 						U32 size = mvci.getSize();
-						std::vector<U8> data(size);
-						memset(&(data[0]), 0, size);
+						std::vector<U8> data(size, 0);
 						cur_data_block->addData(mvci.getName(), &(data[0]), 
 												size, mvci.getType());
 					}
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)
 		GtkColorSelection *colorsel = GTK_COLOR_SELECTION (GTK_COLOR_SELECTION_DIALOG(win)->colorsel);
 
 		GdkColor color, orig_color;
+		orig_color.pixel = 0;
 		orig_color.red = guint16(65535 * *r);
 		orig_color.green= guint16(65535 * *g);
 		orig_color.blue = guint16(65535 * *b);
-- 
cgit v1.1