From 91e4b2e493ec7aad540c0c3315ee57898926b0a1 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sun, 15 May 2011 16:21:14 -0700
Subject: Fix for button labels in case there's ever a conflict between a
 disabled selected button and the selected label it should have

---
 linden/indra/llui/llbutton.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'linden')

diff --git a/linden/indra/llui/llbutton.cpp b/linden/indra/llui/llbutton.cpp
index 6c0891c..58c1dbc 100644
--- a/linden/indra/llui/llbutton.cpp
+++ b/linden/indra/llui/llbutton.cpp
@@ -1038,7 +1038,7 @@ LLView* LLButton::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *fa
 	std::string label_disabled = label;
 	node->getAttributeString("label_disabled", label_disabled);
 
-	std::string label_disabled_selected = label;
+	std::string label_disabled_selected = label_selected;
 	node->getAttributeString("label_disabled_selected", label_disabled_selected);
 
 	LLFontGL* font = selectFont(node);
-- 
cgit v1.1