livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Undid FIRE-3948 and made "Block" button optional (Preferences -> Firestorm -> Protection -> Remove "Block" button from script dialogs)

Ansariel 2013-03-18 18:37:18 +01:00
parent 5ea67f49bc
commit 4170230132
4 changed files with 42 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/app_settings/settings.xml
View File

@ -20116,5 +20116,16 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Value</key>
<integer>0</integer>
</map>
<key>FSRemoveScriptBlockButton</key>
<map>
<key>Comment</key>
<string>Removes the "block" from script dialogs.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
</map>
</llsd>

24
indra/newview/lltoastnotifypanel.cpp
View File

@ -309,12 +309,12 @@ void LLToastNotifyPanel::updateButtonsLayout(const std::vector<index_button_pair
S32 bottom_offset = mIsScriptDialog ? (BTN_HEIGHT + IGNORE_BTN_TOP_DELTA + BOTTOM_PAD) : BOTTOM_PAD;
S32 max_width = mControlPanel->getRect().getWidth();
LLButton* ignore_btn = NULL;
// LLButton* mute_btn = NULL; *spam protection is part of FS now. May be a debug setting in future*
LLButton* mute_btn = NULL;
for (std::vector<index_button_pair_t>::const_iterator it = buttons.begin(); it != buttons.end(); it++)
{
if (-2 == it->first)
{
// mute_btn = it->second; *Removing Mute Button*
mute_btn = it->second;
continue;
}
if (it->first == -1)
@ -351,16 +351,18 @@ void LLToastNotifyPanel::updateButtonsLayout(const std::vector<index_button_pair
mute_btn_pad = 4 * HPAD; //only use a 4 * HPAD padding if an ignore button exists
}
// FIRE-3948: Commenting all out as mute button is disabled (FS:MS)
// if (mIsScriptDialog && mute_btn != NULL)
//{
// LLRect mute_btn_rect(mute_btn->getRect());
// <FS:Ansariel> Undo the removal and make it optional after I was looking for the mute button on spammy dialogs!
//if (mIsScriptDialog && mute_btn != NULL)
if (mIsScriptDialog && mute_btn != NULL && !gSavedSettings.getBOOL("FSRemoveScriptBlockButton"))
{
LLRect mute_btn_rect(mute_btn->getRect());
// Place mute (Block) button to the left of the ignore button.
// S32 mute_btn_left = max_width - mute_btn_rect.getWidth() - ignore_btn_width - mute_btn_pad;
// mute_btn_rect.setOriginAndSize(mute_btn_left, BOTTOM_PAD,// always move mute button at the bottom
// mute_btn_rect.getWidth(), mute_btn_rect.getHeight());
// mute_btn->setRect(mute_btn_rect);
// mControlPanel->addChild(mute_btn);
//}
S32 mute_btn_left = max_width - mute_btn_rect.getWidth() - ignore_btn_width - mute_btn_pad;
mute_btn_rect.setOriginAndSize(mute_btn_left, BOTTOM_PAD,// always move mute button at the bottom
mute_btn_rect.getWidth(), mute_btn_rect.getHeight());
mute_btn->setRect(mute_btn_rect);
mControlPanel->addChild(mute_btn);
}
}
void LLToastNotifyPanel::adjustPanelForScriptNotice(S32 button_panel_width, S32 button_panel_height)
{

1
indra/newview/skins/default/xui/de/panel_preferences_firestorm.xml
View File

@ -65,6 +65,7 @@
<spinner name="_NACL_AntiSpamSoundPreloadMulti" tool_tip="Ereignis-Multplikator für Sound-Preload-Anfragen [Standard: 4]"/>
<button name="AntiSpamUnblock" label="Alle blockierten Spam-Quellen freigeben" width="250"/>
<check_box label="„Blockieren“-Button von Skript-Dialogen entfernen" name="FSRemoveScriptBlockButton"/>
<check_box label="Benachrichtigen, falls Objekte zu schnell eintreffen" name="FSNotifyIncomingObjectSpam"/>
<check_box label="Benachrichtigen, falls Objekte von anderen Einwohnern zu schnell eintreffen" name="FSNotifyIncomingObjectSpamFrom"/>
<slider name="FSOfferThrottleMaxCount" label="Schwellwert für zu schnell eintreffende Objekte:" label_width="260" width="385" tool_tip="Setzt den Schwellwert für die Anzahl an eintreffenden Objekten innerhalb von 10 Sekunden, ab dem eine Drosselung einsetzt. Standardwert: 5"/>

25
indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
View File

@ -263,7 +263,7 @@
label="Protection"
name="ProtectionTab">
<check_box
top_pad="12"
top_pad="10"
left="10"
label="Block left-click sitting on objects"
control_name="FSBlockClickSit"
@ -272,7 +272,7 @@
name="FSBlockClickSit"
width="256" />
<check_box
top_pad="5"
top_pad="4"
label="Allow scripts to show map UI (llMapDestination)"
control_name="ScriptsCanShowUI"
follows="left|top"
@ -281,7 +281,7 @@
width="256" />
<text
top_pad="10"
top_pad="5"
follows="left|top"
height="12"
name="revokepermissions_txt"
@ -333,15 +333,15 @@
<text
left="5"
top_pad="10"
top_pad="5"
follows="left|top"
height="12"
name="SurfaceAreaThreshholdLabel"
width="360">
Texture Lag Protection (may break some objects):
</text>
<check_box
top_pad="10"
<check_box
top_pad="8"
left="20"
label="Automatically hide large objects with high texture area. Threshold: "
control_name="RenderVolumeSAProtection"
@ -366,7 +366,7 @@
width="90" />
<check_box
top_pad="15"
top_pad="10"
left="10"
label="Enable Spam Protection"
control_name="UseAntiSpam"
@ -496,6 +496,15 @@
<check_box
top_pad="10"
left="10"
label="Remove &quot;Block&quot; button from script dialogs"
control_name="FSRemoveScriptBlockButton"
follows="left|top"
height="16"
name="FSRemoveScriptBlockButton"
width="200" />
<check_box
top_pad="4"
left="10"
label="Notify about items from objects coming in too fast"
control_name="FSNotifyIncomingObjectSpam"
follows="left|top"
@ -503,7 +512,7 @@
name="FSNotifyIncomingObjectSpam"
width="200" />
<check_box
top_pad="5"
top_pad="4"
left="10"
label="Notify about items from other residents coming in too fast"
control_name="FSNotifyIncomingObjectSpamFrom"