Ported gSavedSettings changes from Emerald (as well as modifying a few of ours)

1 files changed, 10 insertions, 4 deletions

diff --git a/linden/indra/newview/llnotify.cpp b/linden/indra/newview/llnotify.cpp
index ef57aaf..1a7b247 100644
--- a/linden/indra/newview/llnotify.cpp
+++ b/linden/indra/newview/llnotify.cpp
@@ -227,7 +227,10 @@ LLNotifyBox::LLNotifyBox(LLNotificationPtr notification,
 
                 caution_box->setFontStyle(LLFontGL::BOLD);
                 caution_box->setColor(gColors.getColor("NotifyCautionWarnColor"));
-                caution_box->setBackgroundColor(gColors.getColor("NotifyCautionBoxColor"));
+
+                static LLColor4* sNotifyCautionBoxColor = rebind_llcontrol<LLColor4>("NotifyCautionBoxColor", &gColors, true);
+                
+                caution_box->setBackgroundColor((*sNotifyCautionBoxColor));
                 caution_box->setBorderVisible(FALSE);
                 caution_box->setWrappedText(notification->getMessage());
                 
@@ -485,7 +488,10 @@ void LLNotifyBox::drawBackground() const
         {
                 gGL.getTexUnit(0)->bind(imagep->getImage());
                 // set proper background color depending on whether notify box is a caution or not
-                LLColor4 color = mIsCaution? gColors.getColor("NotifyCautionBoxColor") : gColors.getColor("NotifyBoxColor");
+                static LLColor4* sNotifyCautionBoxColor = rebind_llcontrol<LLColor4>("NotifyCautionBoxColor", &gColors, true);
+                static LLColor4* sNotifyBoxColor = rebind_llcontrol<LLColor4>("NotifyBoxColor", &gColors, true);
+
+                LLColor4 color = mIsCaution? (*sNotifyCautionBoxColor) : (*sNotifyBoxColor);
                 if(gFocusMgr.childHasKeyboardFocus( this ))
                 {
                         const S32 focus_width = 2;
@@ -500,9 +506,9 @@ void LLNotifyBox::drawBackground() const
                         gl_segmented_rect_2d_tex(0, getRect().getHeight(), getRect().getWidth(), 0, imagep->getTextureWidth(), imagep->getTextureHeight(), 16, mIsTip ? ROUNDED_RECT_TOP : ROUNDED_RECT_BOTTOM);
 
                         if( mIsCaution )
-                                color = gColors.getColor("NotifyCautionBoxColor");
+                                color = (*sNotifyCautionBoxColor);
                         else
-                                color = gColors.getColor("NotifyBoxColor");
+                                color = (*sNotifyBoxColor);
 
                         gGL.color4fv(color.mV);
                         gl_segmented_rect_2d_tex(1, getRect().getHeight()-1, getRect().getWidth()-1, 1, imagep->getTextureWidth(), imagep->getTextureHeight(), 16, mIsTip ? ROUNDED_RECT_TOP : ROUNDED_RECT_BOTTOM);