From dea3558cb2939fce04f3df4a508c4f512a6e7a95 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Wed, 16 Nov 2011 20:09:04 +0100 Subject: [PATCH] Make tag color selection fail proof --- indra/newview/fspanelprefs.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/indra/newview/fspanelprefs.cpp b/indra/newview/fspanelprefs.cpp index bcb0164eeb..8d1b5db76b 100644 --- a/indra/newview/fspanelprefs.cpp +++ b/indra/newview/fspanelprefs.cpp @@ -208,9 +208,8 @@ void PanelPreferenceFirestorm::refreshTagCombos() LLColor4 tag_color = gSavedPerAccountSettings.getColor4("FirestormTagColor"); - LLSD selectedColor; - if (tag_color==LLColor4::red) selectedColor = LLSD("red"); - else if (tag_color==LLColor4::blue) selectedColor = LLSD("blue"); + LLSD selectedColor("red"); // default case: red + if (tag_color==LLColor4::blue) selectedColor = LLSD("blue"); else if (tag_color==LLColor4::yellow) selectedColor = LLSD("yellow"); else if (tag_color==LLColor4::purple) selectedColor = LLSD("purple"); else if (tag_color==LLColor4((F32)0.99,(F32)0.56,(F32)0.65,(F32)1)) selectedColor = LLSD("pink");