Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[STORM-68b] Default permissions floater overhaul

Browse Source 
Adds separated default permissions for Objects, Uploads, Scripts, Notecards, Gestures and Wearables.

Compatible with Export Permission
Backwards compatible with default permissions for objects on regions where AgentPreferences capability is not available (opensim users rejoice!)

These changes to llfloaterperms are made available under lgpl, if there's a v3 that wants to adopt default export permission for opensim.
This commit is contained in:
Inusaito Sayori
2014-06-14 15:32:50 -04:00
parent bfc986a97d
commit eebee9b7c1
31 changed files with 1119 additions and 381 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/skins/default/xui/de/notifications.xml
View File

@@ -210,8 +210,6 @@ Dieses Kontrollkästchen zeigt Folgendes an:
Die Second Life Website f&#xFC;r weitere Informationen &#xFC;ber Partnerschaften &#xF6;ffnen?<usetemplate name="okcancelbuttons" yestext="Gehe zu Seite"/></notification>
<notification name="ClickUploadHelpPermissions">Ihre Standardberechtigung funktionieren in &#xE4;lteren Regionen m&#xF6;glicherweise nicht.</notification>
<notification name="ClickWebProfileHelpAvatar">Wenn dieser Einwohner einen Webprofil-URL angegeben hat, k&#xF6;nnen Sie:
* Auf &#x201E;Laden&#x201C; klicken und die Seite in dieser Web-Registerkarte anzeigen.
* Auf Laden &gt; &#x201E;In externem Browser&#x201C; klicken und die Seite im Standard-Browser anzeigen.

76
indra/newview/skins/default/xui/en-us/floater_perm_prefs.xml
View File

@@ -1,15 +1,67 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="perm prefs" title="Default Upload Permissions" width="315" height="180" rect_control="FloaterPermPrefsRect" can_close="true" can_minimize="true">
<panel label="Permissions" name="permissions" width="292" height="120" left="10" border="true" bottom="-140">
<button name="help" label="?" label_selected="?" bottom_delta="-25" height="18" width="22" left="260"/>
<check_box bottom_delta="0" width="106" height="16" left="10" initial_value="false" label="Share with group" name="share_with_group" control_name="ShareWithGroup"/>
<check_box bottom_delta="-20" width="130" height="16" initial_value="false" label="Allow anyone to copy" name="everyone_copy" control_name="EveryoneCopy"/>
<check_box bottom_delta="-20" label="Allow exportation" name="everyone_export" control_name="EveryoneExport"/>
<text bottom_delta="-18" name="NextOwnerLabel" height="10">Next owner can:</text>
<check_box bottom_delta="-30" width="78" height="16" initial_value="false" label="Modify" name="next_owner_modify" control_name="NextOwnerModify"/>
<check_box bottom_delta="0" width="88" height="16" left_delta="78" initial_value="false" label="Copy" name="next_owner_copy" control_name="NextOwnerCopy"/>
<check_box bottom_delta="0" width="106" height="16" left_delta="88" initial_value="true" label="Resell/Give away" name="next_owner_transfer" control_name="NextOwnerTransfer"/>
<floater name="perm prefs" title="Default Creation Permissions" width="820" height="250" rect_control="FloaterPermPrefsRect" can_close="true" can_minimize="true">
<panel label="Permissions" name="permissions" width="800" height="180" left="10" border="false" bottom="-210" mouse_opaque="false">
<view_border bevel_style="none" height="18" bottom_delta="-26" left="0" width="430"/>
<text follows="left|top" bottom_delta="0" left="4" name="NextOwnerLabel" height="16">Next owner:</text>
<text follows="left|top" bottom_delta="0" left_delta="120" name="NextOwnerCopyLabel" height="16">Copy</text>
<text follows="left|top" bottom_delta="0" left_delta="105" name="NextOwnerModifyLabel" height="16">Modify</text>
<text follows="left|top" bottom_delta="0" left_delta="105" name="NextOwnerTransferLabel" height="16">Transfer</text>
<text follows="left|top" bottom_delta="0" left_delta="105" name="ShareWithGroupLabel" height="16">Share With Group</text>
<text follows="left|top" bottom_delta="0" left_delta="105" name="AnyoneCopyLabel" height="16">Allow anyone to copy</text>
<text follows="left|top" bottom_delta="0" left_delta="125" width="120" name="ExportationLabel" height="16">Allow exportation</text>
<text follows="left|top" bottom_delta="-26" left="4" name="ObjectsLabel" height="16" tool_tip="Set default permissions for when Objects are created">Objects</text>
<icon follows="left|top" bottom_delta="0" left_delta="102" image_name="inv_item_object.tga" width="18" height="16"/>
<check_box follows="left|top" bottom_delta="0" width="100" height="16" left_delta="18" label="" name="Objectsnext_owner_copy" control_name="ObjectsNextOwnerCopy"/>
<check_box follows="left|top" bottom_delta="0" width="100" height="16" left_delta="110" label="" name="Objectsnext_owner_modify" control_name="ObjectsNextOwnerModify"/>
<check_box follows="left|top" bottom_delta="0" width="100" height="16" left_delta="110" label="" name="Objectsnext_owner_transfer" control_name="ObjectsNextOwnerTransfer"/>
<check_box follows="left|top" bottom_delta="0" width="100" height="16" left_delta="110" label="" name="Objectsshare_with_group" control_name="ObjectsShareWithGroup"/>
<check_box follows="left|top" bottom_delta="0" width="120" height="16" left_delta="110" label="" name="Objectseveryone_copy" control_name="ObjectsEveryoneCopy"/>
<check_box follows="left|top" bottom_delta="0" height="16" left_delta="130" label="" name="Objectseveryone_export" control_name="ObjectsEveryoneExport"/>
<text follows="left|top" bottom_delta="-20" left="4" name="UploadsLabel" height="16" tool_tip="Set default permissions for uploaded items">Uploads</text>
<icon follows="left|top" bottom_delta="0" left_delta="102" image_name="inv_item_texture.tga" width="18" height="16"/>
<check_box follows="left|top" bottom_delta="0" width="100" height="16" left_delta="18" label="" name="Uploadsnext_owner_copy" control_name="UploadsNextOwnerCopy"/>
<check_box follows="left|top" bottom_delta="0" width="100" height="16" left_delta="110" label="" name="Uploadsnext_owner_modify" control_name="UploadsNextOwnerModify"/>
<check_box follows="left|top" bottom_delta="0" width="100" height="16" left_delta="110" label="" name="Uploadsnext_owner_transfer" control_name="UploadsNextOwnerTransfer"/>
<check_box follows="left|top" bottom_delta="0" width="100" height="16" left_delta="110" label="" name="Uploadsshare_with_group" control_name="UploadsShareWithGroup"/>
<check_box follows="left|top" bottom_delta="0" width="120" height="16" left_delta="110" label="" name="Uploadseveryone_copy" control_name="UploadsEveryoneCopy"/>
<check_box follows="left|top" bottom_delta="0" height="16" left_delta="130" label="" name="Uploadseveryone_export" control_name="UploadsEveryoneExport"/>
<text follows="left|top" bottom_delta="-20" left="4" name="ScriptsLabel" height="16" tool_tip="Set default permissions for when Scripts are created">Scripts</text>
<icon follows="left|top" bottom_delta="0" left_delta="102" image_name="inv_item_script.tga" width="18" height="16"/>
<check_box follows="left|top" bottom_delta="0" width="100" height="16" left_delta="18" label="" name="Scriptsnext_owner_copy" control_name="ScriptsNextOwnerCopy"/>
<check_box follows="left|top" bottom_delta="0" width="100" height="16" left_delta="110" label="" name="Scriptsnext_owner_modify" control_name="ScriptsNextOwnerModify"/>
<check_box follows="left|top" bottom_delta="0" width="100" height="16" left_delta="110" label="" name="Scriptsnext_owner_transfer" control_name="ScriptsNextOwnerTransfer"/>
<check_box follows="left|top" bottom_delta="0" width="100" height="16" left_delta="110" label="" name="Scriptsshare_with_group" control_name="ScriptsShareWithGroup"/>
<check_box follows="left|top" bottom_delta="0" width="120" height="16" left_delta="110" label="" name="Scriptseveryone_copy" control_name="ScriptsEveryoneCopy"/>
<check_box follows="left|top" bottom_delta="0" height="16" left_delta="130" label="" name="Scriptseveryone_export" control_name="ScriptsEveryoneExport"/>
<text follows="left|top" bottom_delta="-20" left="4" name="NotecardsLabel" height="16" tool_tip="Set default permissions for when Notecards are created">Notecards</text>
<icon follows="left|top" bottom_delta="0" left_delta="102" image_name="inv_item_notecard.tga" width="18" height="16"/>
<check_box follows="left|top" bottom_delta="0" width="100" height="16" left_delta="18" label="" name="Notecardsnext_owner_copy" control_name="NotecardsNextOwnerCopy"/>
<check_box follows="left|top" bottom_delta="0" width="100" height="16" left_delta="110" label="" name="Notecardsnext_owner_modify" control_name="NotecardsNextOwnerModify"/>
<check_box follows="left|top" bottom_delta="0" width="100" height="16" left_delta="110" label="" name="Notecardsnext_owner_transfer" control_name="NotecardsNextOwnerTransfer"/>
<check_box follows="left|top" bottom_delta="0" width="100" height="16" left_delta="110" label="" name="Notecardsshare_with_group" control_name="NotecardsShareWithGroup"/>
<check_box follows="left|top" bottom_delta="0" width="120" height="16" left_delta="110" label="" name="Notecardseveryone_copy" control_name="NotecardsEveryoneCopy"/>
<check_box follows="left|top" bottom_delta="0" height="16" left_delta="130" label="" name="Notecardseveryone_export" control_name="NotecardsEveryoneExport"/>
<text follows="left|top" bottom_delta="-20" left="4" name="GesturesLabel" height="16" tool_tip="Set default permissions for when Gestures are created">Gestures</text>
<icon follows="left|top" bottom_delta="0" left_delta="102" image_name="inv_item_gesture.tga" width="18" height="16"/>
<check_box follows="left|top" bottom_delta="0" width="100" height="16" left_delta="18" label="" name="Gesturesnext_owner_copy" control_name="GesturesNextOwnerCopy"/>
<check_box follows="left|top" bottom_delta="0" width="100" height="16" left_delta="110" label="" name="Gesturesnext_owner_modify" control_name="GesturesNextOwnerModify"/>
<check_box follows="left|top" bottom_delta="0" width="100" height="16" left_delta="110" label="" name="Gesturesnext_owner_transfer" control_name="GesturesNextOwnerTransfer"/>
<check_box follows="left|top" bottom_delta="0" width="100" height="16" left_delta="110" label="" name="Gesturesshare_with_group" control_name="ShareWithGroup"/>
<check_box follows="left|top" bottom_delta="0" width="120" height="16" left_delta="110" label="" name="Gestureseveryone_copy" control_name="GesturesEveryoneCopy"/>
<check_box follows="left|top" bottom_delta="0" height="16" left_delta="130" label="" name="Gestureseveryone_export" control_name="GesturesEveryoneExport"/>
<text follows="left|top" bottom_delta="-20" left="4" name="WearablesLabel" height="16" tool_tip="Set default permissions for when Clothing or Body Parts are created">Wearables</text>
<icon follows="left|top" bottom_delta="0" left_delta="102" image_name="inv_item_clothing.tga" width="18" height="16"/>
<check_box follows="left|top" bottom_delta="0" width="100" height="16" left_delta="18" label="" name="Wearablesnext_owner_copy" control_name="WearablesNextOwnerCopy"/>
<check_box follows="left|top" bottom_delta="0" width="100" height="16" left_delta="110" label="" name="Wearablesnext_owner_modify" control_name="WearablesNextOwnerModify"/>
<check_box follows="left|top" bottom_delta="0" width="100" height="16" left_delta="110" label="" name="Wearablesnext_owner_transfer" control_name="WearablesNextOwnerTransfer"/>
<check_box follows="left|top" bottom_delta="0" width="100" height="16" left_delta="110" label="" name="Wearablesshare_with_group" control_name="WearablesShareWithGroup"/>
<check_box follows="left|top" bottom_delta="0" width="120" height="16" left_delta="110" label="" name="Wearableseveryone_copy" control_name="WearablesEveryoneCopy"/>
<check_box follows="left|top" bottom_delta="0" height="16" left_delta="130" label="" name="Wearableseveryone_export" control_name="WearablesEveryoneExport"/>
</panel>
<button bottom_delta="-30" height="20" label="OK" label_selected="OK" left="90" name="ok" width="100"/>
<button bottom_delta="0" height="20" label="Cancel" label_selected="Cancel" left_delta="105" name="cancel" width="100"/>
<button bottom_delta="-30" height="20" label="OK" label_selected="OK" left="297" name="ok" width="100">
<button.commit_callback function="PermsDefault.OK"/>
</button>
<button bottom_delta="0" height="20" label="Cancel" label_selected="Cancel" left_delta="105" name="cancel" width="100">
<button.commit_callback function="PermsDefault.Cancel"/>
</button>
</floater>

18
indra/newview/skins/default/xui/en-us/notifications.xml
View File

@@ -693,13 +693,6 @@ Go to the [SECOND_LIFE] web site for more information on partnering?
yestext="Go to Page"/>
</notification>
<notification
icon="alertmodal.tga"
name="ClickUploadHelpPermissions"
type="alertmodal">
Your default permissions may not work in older regions.
</notification>
<notification
icon="alertmodal.tga"
name="ClickWebProfileHelpAvatar"
@@ -9750,6 +9743,17 @@ An internal error prevented us from properly updating your viewer. The L$ balan
Cannot create large prims that intersect other players. Please re-try when other players have moved.
</notification>
<notification
icon="alertmodal.tga"
name="DefaultObjectPermissions"
type="alert">
There was a problem saving the default permissions due to the following reason: [REASON]. Please try setting the default permissions later.
<tag>fail</tag>
<usetemplate
name="okbutton"
yestext="OK"/>
</notification>
<!-- Singularity Specific notifications should go below here, alphabetically -->
<!-- Singu Note: RLVa notifications come first here -->

12
indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
View File

@@ -137,13 +137,13 @@
</combo_box>
<text bottom="-19" left_delta="85" name="text_box7" halign="center" width="145">Next Owner Perms</text>
<text bottom="-34" left_delta="0" name="text_box8" halign="center" width="65">Objects</text>
<check_box follows="top" height="16" initial_value="false" label="Copy" tool_tip="Next owner can make copies of creations" name="next_owner_copy" control_name="NextOwnerCopy"/>
<check_box follows="top" height="16" initial_value="false" label="Modify" tool_tip="Next owner can edit creations" name="next_owner_modify" control_name="NextOwnerModify"/>
<check_box follows="top" height="16" initial_value="true" label="Transfer" tool_tip="Next owner can give(or sell) creations" name="next_owner_transfer" control_name="NextOwnerTransfer" enabled_control="NextOwnerCopy"/>
<check_box follows="top" height="16" initial_value="false" label="Copy" tool_tip="Next owner can make copies of creations" name="next_owner_copy" control_name="ObjectsNextOwnerCopy"/>
<check_box follows="top" height="16" initial_value="false" label="Modify" tool_tip="Next owner can edit creations" name="next_owner_modify" control_name="ObjectsNextOwnerModify"/>
<check_box follows="top" height="16" initial_value="true" label="Transfer" tool_tip="Next owner can give(or sell) creations" name="next_owner_transfer" control_name="ObjectsNextOwnerTransfer" enabled_control="ObjectsNextOwnerCopy"/>
<text bottom="-34" left_delta="85" name="text_box9" halign="center" width="65">Scripts</text>
<check_box follows="top" height="16" label="Copy" tool_tip="Next owner can make copies of scripts" name="script_next_owner_copy" control_name="ScriptNextOwnerCopy"/>
<check_box follows="top" height="16" label="Modify" tool_tip="Next owner can edit scripts" name="script_next_owner_modify" control_name="ScriptNextOwnerModify"/>
<check_box follows="top" height="16" label="Transfer" tool_tip="Next owner can give(or sell) scripts" name="script_next_owner_transfer" control_name="ScriptNextOwnerTransfer" enabled_control="ScriptNextOwnerCopy"/>
<check_box follows="top" height="16" label="Copy" tool_tip="Next owner can make copies of scripts" name="script_next_owner_copy" control_name="ScriptsNextOwnerCopy"/>
<check_box follows="top" height="16" label="Modify" tool_tip="Next owner can edit scripts" name="script_next_owner_modify" control_name="ScriptsNextOwnerModify"/>
<check_box follows="top" height="16" label="Transfer" tool_tip="Next owner can give(or sell) scripts" name="script_next_owner_transfer" control_name="ScriptsNextOwnerTransfer" enabled_control="ScriptsNextOwnerCopy"/>
<check_box bottom="-131" left="5" follows="top" height="16" label="Phantom" name="EmPhantomToggle" control_name="EmeraldBuildPrefs_Phantom"/>
<check_box follows="top" height="16" label="Physical" name="EmPhysicalToggle" control_name="EmeraldBuildPrefs_Physical"/>
<check_box follows="top" height="16" label="Temporary" name="EmTemporaryToggle" control_name="EmeraldBuildPrefs_Temporary"/>

4
indra/newview/skins/default/xui/es/notifications.xml
View File

@@ -372,10 +372,6 @@ Marcando este ítem, se mostrará:
<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Ir a la Página"/>
</notification>
<notification name="ClickUploadHelpPermissions">
Tus permisos por defecto no funcionarán en regiones antiguas.
</notification>
<notification name="ClickWebProfileHelpAvatar">
Si este residente ha indicado una URL para mostrar un perfil en la web, tu puedes:
* Pulsar &apos;Cargar&apos; para ver la página en esta pestaña web.

4
indra/newview/skins/default/xui/fr/notifications.xml
View File

@@ -244,10 +244,6 @@ Aller sur le site de [SECOND_LIFE_GRID] pour avoir plus d'informations sur les p
<usetemplate name="okcancelbuttons" notext="Annuler" yestext="Aller sur cette page"/>
</notification>
<notification name="ClickUploadHelpPermissions">
Il est possible que vos droits par défaut ne fonctionnent pas dans les anciennes régions.
</notification>
<notification name="ClickWebProfileHelpAvatar">
Si ce résident a défini une URL de profil web, vous pouvez:
* Cliquer sur Charger pour afficher la page dans cet onglet;

3
indra/newview/skins/default/xui/it/notifications.xml
View File

@@ -235,9 +235,6 @@ Marcando questo campo si mostrerà:
Vai al sito web di Second Life per ulteriori informazioni sulla partnership?
<usetemplate name="okcancelbuttons" notext="Annulla" yestext="Vai alla pagina"/>
</notification>
<notification name="ClickUploadHelpPermissions">
I tuoi permessi di base possono non funzionare nelle regioni più vecchie.
</notification>
<notification name="ClickWebProfileHelpAvatar">
Se questo/a residente ha impostato una URL nel suo profilo puoi:
* Cliccare &apos;Carica&apos; per vedere la pagina in questa finestra web.

4
indra/newview/skins/default/xui/pt/notifications.xml
View File

@@ -300,10 +300,6 @@ Ir para o site do [SECOND_LIFE] para mais informações sobre parceria?
<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Ir para a Página"/>
</notification>
<notification name="ClickUploadHelpPermissions">
Suas permissões padrão podem não funcionar em regiões antigas.
</notification>
<notification name="ClickWebProfileHelpAvatar">
Se este Residente definiu uma URL de perfil na web, então você pode:
* Clicar em 'Carregar' para ver a página na aba Web.