summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xindra/newview/app_settings/settings.xml67
-rwxr-xr-xindra/newview/llfloaterperms.cpp20
-rwxr-xr-xindra/newview/llfloaterperms.h3
-rwxr-xr-xindra/newview/llfloaterpreference.cpp3
-rw-r--r--indra/newview/skins/default/xui/en/floater_perms_default.xml40
-rwxr-xr-xindra/newview/skins/default/xui/en/menu_viewer.xml7
-rwxr-xr-xindra/newview/skins/default/xui/en/panel_preferences_advanced.xml2
7 files changed, 105 insertions, 37 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 9cb63c6518..7e9971bc7d 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -14815,6 +14815,17 @@
<key>Value</key>
<integer>0</integer>
</map>
+ <key>DefaultUploadPermissionsConverted</key>
+ <map>
+ <key>Comment</key>
+ <string>Default upload permissions have been converted to default creation permissions</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
<key>PathfindingRetrieveNeighboringRegion</key>
<map>
<key>Comment</key>
@@ -15213,6 +15224,62 @@
<key>Value</key>
<string />
</map>
+ <key>EveryoneCopy</key>
+ <map>
+ <key>Comment</key>
+ <string>(obsolete) Everyone can copy the newly created objects</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
+ <key>NextOwnerCopy</key>
+ <map>
+ <key>Comment</key>
+ <string>(obsolete) Newly created objects can be copied by next owner</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
+ <key>NextOwnerModify</key>
+ <map>
+ <key>Comment</key>
+ <string>(obsolete) Newly created objects can be modified by next owner</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
+ <key>NextOwnerTransfer</key>
+ <map>
+ <key>Comment</key>
+ <string>(obsolete) Newly created objects can be resold or given away by next owner</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
+ <key>ShareWithGroup</key>
+ <map>
+ <key>Comment</key>
+ <string>(obsolete) Newly created objects are shared with the currently active group</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
+
</map>
</llsd>
diff --git a/indra/newview/llfloaterperms.cpp b/indra/newview/llfloaterperms.cpp
index 0178c0b4f1..cc1ff54cb4 100755
--- a/indra/newview/llfloaterperms.cpp
+++ b/indra/newview/llfloaterperms.cpp
@@ -103,7 +103,6 @@ LLFloaterPermsDefault::LLFloaterPermsDefault(const LLSD& seed)
: LLFloater(seed)
{
mCommitCallbackRegistrar.add("PermsDefault.Copy", boost::bind(&LLFloaterPermsDefault::onCommitCopy, this, _2));
- mCommitCallbackRegistrar.add("PermsDefault.Apply", boost::bind(&LLFloaterPermsDefault::onClickApply, this));
mCommitCallbackRegistrar.add("PermsDefault.OK", boost::bind(&LLFloaterPermsDefault::onClickOK, this));
mCommitCallbackRegistrar.add("PermsDefault.Cancel", boost::bind(&LLFloaterPermsDefault::onClickCancel, this));
}
@@ -123,6 +122,16 @@ const std::string LLFloaterPermsDefault::sCategoryNames[CAT_LAST] =
BOOL LLFloaterPermsDefault::postBuild()
{
+ if(!gSavedSettings.getBOOL("DefaultUploadPermissionsConverted"))
+ {
+ gSavedSettings.setBOOL("UploadsEveryoneCopy", gSavedSettings.getBOOL("EveryoneCopy"));
+ gSavedSettings.setBOOL("UploadsNextOwnerCopy", gSavedSettings.getBOOL("NextOwnerCopy"));
+ gSavedSettings.setBOOL("UploadsNextOwnerModify", gSavedSettings.getBOOL("NextOwnerModify"));
+ gSavedSettings.setBOOL("UploadsNextOwnerTransfer", gSavedSettings.getBOOL("NextOwnerTransfer"));
+ gSavedSettings.setBOOL("UploadsShareWithGroup", gSavedSettings.getBOOL("ShareWithGroup"));
+ gSavedSettings.setBOOL("DefaultUploadPermissionsConverted", true);
+ }
+
mCloseSignal.connect(boost::bind(&LLFloaterPermsDefault::cancel, this));
refresh();
@@ -130,14 +139,9 @@ BOOL LLFloaterPermsDefault::postBuild()
return true;
}
-void LLFloaterPermsDefault::onClickApply()
-{
- apply();
-}
-
void LLFloaterPermsDefault::onClickOK()
{
- apply();
+ ok();
closeFloater();
}
@@ -222,7 +226,7 @@ void LLFloaterPermsDefault::setCapSent(bool cap_sent)
mCapSent = cap_sent;
}
-void LLFloaterPermsDefault::apply()
+void LLFloaterPermsDefault::ok()
{
// Changes were already applied automatically to saved settings.
// Refreshing internal values makes it official.
diff --git a/indra/newview/llfloaterperms.h b/indra/newview/llfloaterperms.h
index 12f297960a..2bb0a19dc1 100755
--- a/indra/newview/llfloaterperms.h
+++ b/indra/newview/llfloaterperms.h
@@ -54,9 +54,8 @@ class LLFloaterPermsDefault : public LLFloater
public:
/*virtual*/ BOOL postBuild();
- void apply();
+ void ok();
void cancel();
- void onClickApply();
void onClickOK();
void onClickCancel();
void onCommitCopy(const LLSD& user_data);
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index b5976cbc99..0f6f4a0192 100755
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -1188,6 +1188,9 @@ void LLFloaterPreference::refreshEnabledState()
disableUnavailableSettings();
getChildView("block_list")->setEnabled(LLLoginInstance::getInstance()->authSuccess());
+
+ // Cannot have floater active until caps have been received
+ getChild<LLButton>("default_creation_permissions")->setEnabled(LLStartUp::getStartupState() < STATE_STARTED ? false : true);
}
void LLFloaterPreference::disableUnavailableSettings()
diff --git a/indra/newview/skins/default/xui/en/floater_perms_default.xml b/indra/newview/skins/default/xui/en/floater_perms_default.xml
index 4e44c9ebb3..ceb260fffb 100644
--- a/indra/newview/skins/default/xui/en/floater_perms_default.xml
+++ b/indra/newview/skins/default/xui/en/floater_perms_default.xml
@@ -141,7 +141,7 @@
control_name="ObjectsNextOwnerTransfer"
height="16"
layout="topleft"
- name="Objects_transfer"
+ name="objects_t"
left_pad="0"
top_delta="0"
width="100" />
@@ -157,7 +157,7 @@
control_name="ObjectsEveryoneCopy"
height="16"
layout="topleft"
- name="objects_a"
+ name="objects_e"
left_pad="0"
top_delta="0"
width="100" />
@@ -204,7 +204,7 @@
control_name="UploadsNextOwnerTransfer"
height="16"
layout="topleft"
- name="Uploads_transfer"
+ name="uploads_t"
left_pad="0"
top_delta="0"
width="100" />
@@ -220,7 +220,7 @@
control_name="UploadsEveryoneCopy"
height="16"
layout="topleft"
- name="uploads_a"
+ name="uploads_e"
left_pad="0"
top_delta="0"
width="100" />
@@ -267,7 +267,7 @@
control_name="ScriptsNextOwnerTransfer"
height="16"
layout="topleft"
- name="Scripts_transfer"
+ name="scripts_t"
left_pad="0"
top_delta="0"
width="100" />
@@ -283,7 +283,7 @@
control_name="ScriptsEveryoneCopy"
height="16"
layout="topleft"
- name="scripts_a"
+ name="scripts_e"
left_pad="0"
top_delta="0"
width="100" />
@@ -330,7 +330,7 @@
control_name="NotecardsNextOwnerTransfer"
height="16"
layout="topleft"
- name="Notecards_transfer"
+ name="notecards_t"
left_pad="0"
top_delta="0"
width="100" />
@@ -346,7 +346,7 @@
control_name="NotecardsEveryoneCopy"
height="16"
layout="topleft"
- name="notecards_a"
+ name="notecards_e"
left_pad="0"
top_delta="0"
width="100" />
@@ -393,7 +393,7 @@
control_name="GesturesNextOwnerTransfer"
height="16"
layout="topleft"
- name="Gestures_transfer"
+ name="gestures_t"
left_pad="0"
top_delta="0"
width="100" />
@@ -456,7 +456,7 @@
control_name="WearablesNextOwnerTransfer"
height="16"
layout="topleft"
- name="Wearables_transfer"
+ name="wearables_t"
left_pad="0"
top_delta="0"
width="100" />
@@ -472,33 +472,21 @@
control_name="WearablesEveryoneCopy"
height="16"
layout="topleft"
- name="wearables_a"
+ name="wearables_e"
left_pad="0"
top_delta="0"
width="100" />
</panel>
<button
height="20"
- label="Apply"
- label_selected="Apply"
- layout="topleft"
- name="apply"
- left="375"
- width="100">
- <button.commit_callback
- function="PermsDefault.Apply" />
- </button>
- <button
- height="20"
label="OK"
label_selected="OK"
layout="topleft"
- left_pad="5"
name="ok"
- top_delta="0"
+ left="475"
width="100">
- <button.commit_callback
- function="PermsDefault.OK" />
+ <button.commit_callback
+ function="PermsDefault.OK" />
</button>
<button
height="20"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 554c7c95e4..3c04f07b12 100755
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1077,6 +1077,13 @@
label="Options"
name="Options"
tear_off="true">
+ <menu_item_call
+ label="Set Default Permissions..."
+ name="Set default permissions">
+ <menu_item_call.on_click
+ function="Floater.ToggleOrBringToFront"
+ parameter="perms_default" />
+ </menu_item_call>
<menu_item_check
label="Show Advanced Permissions"
name="DebugPermissions">
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
index 335f1614d8..2e778014c5 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -226,7 +226,7 @@
height="20"
label="Default Creation Permissions"
layout="topleft"
- name="Default Creation Permissions"
+ name="default_creation_permissions"
left="30"
top_pad = "20"
width="250">
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-14 16:16:24 +0000