diff options
author | McCabe Maxsted | 2010-08-23 11:32:27 -0700 |
---|---|---|
committer | McCabe Maxsted | 2010-08-28 05:01:22 -0700 |
commit | 837a8292c07d6f5c067dc37fc3fb15db2d9f32c0 (patch) | |
tree | 1fecc7e954d4c41b7fe7d12b0d39b7efeba7b9a1 /linden/indra | |
parent | Added 'Copy Key' button to the build general tab (diff) | |
download | meta-impy-837a8292c07d6f5c067dc37fc3fb15db2d9f32c0.zip meta-impy-837a8292c07d6f5c067dc37fc3fb15db2d9f32c0.tar.gz meta-impy-837a8292c07d6f5c067dc37fc3fb15db2d9f32c0.tar.bz2 meta-impy-837a8292c07d6f5c067dc37fc3fb15db2d9f32c0.tar.xz |
Fixed 'Anyone can:' text not disabling in the build window
Diffstat (limited to 'linden/indra')
-rw-r--r-- | linden/indra/newview/llpanelpermissions.cpp | 3 | ||||
-rw-r--r-- | linden/indra/newview/skins/default/xui/en-us/floater_tools.xml | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/linden/indra/newview/llpanelpermissions.cpp b/linden/indra/newview/llpanelpermissions.cpp index afe2de4..fc05744 100644 --- a/linden/indra/newview/llpanelpermissions.cpp +++ b/linden/indra/newview/llpanelpermissions.cpp | |||
@@ -222,6 +222,7 @@ void LLPanelPermissions::refresh() | |||
222 | childSetEnabled("checkbox allow everyone copy",false); | 222 | childSetEnabled("checkbox allow everyone copy",false); |
223 | 223 | ||
224 | //Next owner can: | 224 | //Next owner can: |
225 | childSetEnabled("Anyone can:",false); | ||
225 | childSetEnabled("Next owner can:",false); | 226 | childSetEnabled("Next owner can:",false); |
226 | childSetValue("checkbox next owner can modify",FALSE); | 227 | childSetValue("checkbox next owner can modify",FALSE); |
227 | childSetEnabled("checkbox next owner can modify",false); | 228 | childSetEnabled("checkbox next owner can modify",false); |
@@ -651,12 +652,14 @@ void LLPanelPermissions::refresh() | |||
651 | 652 | ||
652 | if (has_change_perm_ability) | 653 | if (has_change_perm_ability) |
653 | { | 654 | { |
655 | childSetEnabled("Anyone can:", TRUE); | ||
654 | childSetEnabled("checkbox share with group",true); | 656 | childSetEnabled("checkbox share with group",true); |
655 | childSetEnabled("checkbox allow everyone move",owner_mask_on & PERM_MOVE); | 657 | childSetEnabled("checkbox allow everyone move",owner_mask_on & PERM_MOVE); |
656 | childSetEnabled("checkbox allow everyone copy",owner_mask_on & PERM_COPY && owner_mask_on & PERM_TRANSFER); | 658 | childSetEnabled("checkbox allow everyone copy",owner_mask_on & PERM_COPY && owner_mask_on & PERM_TRANSFER); |
657 | } | 659 | } |
658 | else | 660 | else |
659 | { | 661 | { |
662 | childSetEnabled("Anyone can:", FALSE); | ||
660 | childSetEnabled("checkbox share with group", FALSE); | 663 | childSetEnabled("checkbox share with group", FALSE); |
661 | childSetEnabled("checkbox allow everyone move", FALSE); | 664 | childSetEnabled("checkbox allow everyone move", FALSE); |
662 | childSetEnabled("checkbox allow everyone copy", FALSE); | 665 | childSetEnabled("checkbox allow everyone copy", 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 6210cdd..29cd547 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 | |||
@@ -473,7 +473,7 @@ | |||
473 | <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | 473 | <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" |
474 | bottom="-262" drop_shadow_visible="true" follows="left|top|right" | 474 | bottom="-262" drop_shadow_visible="true" follows="left|top|right" |
475 | font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10" | 475 | font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10" |
476 | mouse_opaque="true" name="Next owner can:" v_pad="0" width="250"> | 476 | mouse_opaque="true" name="Anyone can:" v_pad="0" width="250"> |
477 | Anyone Can: | 477 | Anyone Can: |
478 | </text> | 478 | </text> |
479 | <check_box bottom_delta="-22" follows="left|top" font="SansSerifSmall" height="16" | 479 | <check_box bottom_delta="-22" follows="left|top" font="SansSerifSmall" height="16" |