4 files changed, 11 insertions, 2 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index ba63c8b..f9581cc 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,13 @@
 2009-11-18  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
+        * VWR-12620: Linux compile fails with -O2 (--type=Release)
+          Patch by Alissa Sabre.
+
+          modified:   doc/contributions.txt
+          modified:   indra/llmessage/lltemplatemessagereader.cpp
+          modified:   indra/llwindow/llwindowsdl.cpp
+
+
         * Removed prepackaged libstdc++ (Linux only). Fixes VWR-12404.
 
           modified:   linden/indra/cmake/ViewerMiscLibs.cmake
diff --git a/linden/doc/contributions.txt b/linden/doc/contributions.txt
index 2acb043..64304dc 100644
--- a/linden/doc/contributions.txt
+++ b/linden/doc/contributions.txt
@@ -64,6 +64,7 @@ Alissa Sabre
         VWR-7086
         VWR-9190
         VWR-10728
+        VWR-12620
 Angus Boyd
         VWR-592
 Argent Stonecutter
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);