diff options
| author | James Cook <james@lindenlab.com> | 2009-07-07 00:53:05 +0000 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-07-07 00:53:05 +0000 |
| commit | 52aeaa32841e7d0b37abab0a2a2540c2be2f16b7 (patch) | |
| tree | d8f5c98644029dd289a97aa0d8b55c5a6200c214 /indra/newview/skins/default/xui/en/floater_perm_prefs.xml | |
| parent | 2c722655bd6701a3dc8518c6518c51f538765dcd (diff) | |
Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files:
lldraghandle.h, lluictrl.h, llchiclet.cpp, llfolderview.h/cpp, lliinventorybridge.cpp, llpanelpicks.cpp, llviewermenu.cpp, floater_mute.xml, floater_preferences.xml, notifications.xml, panel_preferences_audio.xml, panel_preferences_graphics1.xml, panel_region_general.xml
svn merge -r124961:126284 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-14
Diffstat (limited to 'indra/newview/skins/default/xui/en/floater_perm_prefs.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_perm_prefs.xml | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_perm_prefs.xml b/indra/newview/skins/default/xui/en/floater_perm_prefs.xml index 430cb940e5..e4cb97035c 100644 --- a/indra/newview/skins/default/xui/en/floater_perm_prefs.xml +++ b/indra/newview/skins/default/xui/en/floater_perm_prefs.xml @@ -24,7 +24,11 @@ left="260" name="help" top="7" - width="22" /> + width="22"> + <button.commit_callback + function="Notification.Show" + parameter="ClickUploadHelpPermissions" /> + </button> <check_box control_name="ShareWithGroup" height="16" @@ -72,8 +76,12 @@ left_delta="78" name="next_owner_copy" top_delta="0" - width="88" /> + width="88" > + <check_box.commit_callback + function="Perms.Copy" /> + </check_box> <check_box + enabled_control="NextOwnerCopy" control_name="NextOwnerTransfer" enabled="false" height="16" @@ -93,7 +101,10 @@ left="90" name="ok" top="150" - width="100" /> + width="100"> + <button.commit_callback + function="Perms.OK" /> + </button> <button height="20" label="Cancel" @@ -102,5 +113,8 @@ left_pad="5" name="cancel" top_delta="0" - width="100" /> + width="100"> + <button.commit_callback + function="Perms.Cancel" /> + </button> </floater> |