aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-09-25 00:07:55 -0700
committerMcCabe Maxsted2009-09-25 00:07:55 -0700
commit541e4cd5dc920e21357f97a15ce375a1592edea4 (patch)
tree1d9ff21b78fbe2e77f257a46af3183906b45aef9 /linden
parentClarified 'Track' button tooltip in radar (diff)
downloadmeta-impy-541e4cd5dc920e21357f97a15ce375a1592edea4.zip
meta-impy-541e4cd5dc920e21357f97a15ce375a1592edea4.tar.gz
meta-impy-541e4cd5dc920e21357f97a15ce375a1592edea4.tar.bz2
meta-impy-541e4cd5dc920e21357f97a15ce375a1592edea4.tar.xz
Fixed Last Owner text in tools window not disabling
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llpanelpermissions.cpp2
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_tools.xml2
2 files changed, 3 insertions, 1 deletions
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()
353 if ( (owner_name != last_owner_name) && (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) ) 353 if ( (owner_name != last_owner_name) && (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) )
354// [/RLVa:KB] 354// [/RLVa:KB]
355 { 355 {
356 childSetEnabled("Last Owner:", TRUE);
356 childSetText("Last Owner Name", last_owner_name); 357 childSetText("Last Owner Name", last_owner_name);
357 childSetEnabled("Last Owner Name", TRUE); 358 childSetEnabled("Last Owner Name", TRUE);
358 childSetEnabled("button last owner profile", TRUE); 359 childSetEnabled("button last owner profile", TRUE);
359 } 360 }
360 else 361 else
361 { 362 {
363 childSetEnabled("Last Owner:", FALSE);
362 childSetText("Last Owner Name", LLStringUtil::null); 364 childSetText("Last Owner Name", LLStringUtil::null);
363 childSetEnabled("Last Owner Name", FALSE); 365 childSetEnabled("Last Owner Name", FALSE);
364 childSetEnabled("button last owner profile", FALSE); 366 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 @@
389 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 389 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
390 bottom_delta="-20" drop_shadow_visible="true" follows="left|top" 390 bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
391 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10" 391 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
392 mouse_opaque="true" name="LastOwner:" v_pad="0" width="78"> 392 mouse_opaque="true" name="Last Owner:" v_pad="0" width="78">
393 Last Owner: 393 Last Owner:
394 </text> 394 </text>
395 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 395 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"