From 541e4cd5dc920e21357f97a15ce375a1592edea4 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Fri, 25 Sep 2009 00:07:55 -0700
Subject: Fixed Last Owner text in tools window not disabling

---
 ChangeLog.txt                                                  | 6 ++++++
 linden/indra/newview/llpanelpermissions.cpp                    | 2 ++
 linden/indra/newview/skins/default/xui/en-us/floater_tools.xml | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 7fe6fab..7312190 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -13,6 +13,12 @@
 	
 		modified:   linden/indra/newview/llfloatermap.cpp
 		
+		
+	* Fixed Last Owner text in tools window not disabling.
+	
+		modified:   linden/indra/newview/llpanelpermissions.cpp
+		modified:   linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
+
 
 2009-09-22 McCabe Maxsted  <hakushakukun@gmail.com>
 
diff --git a/linden/indra/newview/llpanelpermissions.cpp b/linden/indra/newview/llpanelpermissions.cpp
index aa14a90..42cb88c 100644
--- a/linden/indra/newview/llpanelpermissions.cpp
+++ b/linden/indra/newview/llpanelpermissions.cpp
@@ -353,12 +353,14 @@ void LLPanelPermissions::refresh()
 	if ( (owner_name != last_owner_name) && (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) )
 // [/RLVa:KB]
 	{
+		childSetEnabled("Last Owner:", TRUE);
 		childSetText("Last Owner Name", last_owner_name);
 		childSetEnabled("Last Owner Name", TRUE);
 		childSetEnabled("button last owner profile", TRUE);
 	}
 	else
 	{
+		childSetEnabled("Last Owner:", FALSE);
 		childSetText("Last Owner Name", LLStringUtil::null);
 		childSetEnabled("Last Owner Name", FALSE);
 		childSetEnabled("button last owner profile", FALSE);
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
index a57c568..00f3f3e 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
@@ -389,7 +389,7 @@
       <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
 			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
-			     mouse_opaque="true" name="LastOwner:" v_pad="0" width="78">
+			     mouse_opaque="true" name="Last Owner:" v_pad="0" width="78">
         Last Owner:
       </text>
       <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-- 
cgit v1.1