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

FIRE-6406: Feature to disable Object Return notification

PanteraPolnocy 2013-10-11 01:22:21 +02:00
parent 6f53b2ff18
commit bf70e8dfe7
4 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21580,6 +21580,17 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Value</key>
<integer>0</integer>
</map>
<key>FSDisableReturnObjectNotification</key>
<map>
<key>Comment</key>
<string>Disable 'Object has been returned to your inventory Lost and Found folder' notifications</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
</map>
</llsd>

11
indra/newview/llviewermessage.cpp
View File

@ -3357,6 +3357,17 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
return;
}
// <FS:PP> FIRE-6406: Feature to disable Object Return notification
static LLCachedControl<bool> FSDisableReturnObjectNotification(gSavedSettings, "FSDisableReturnObjectNotification");
if (FSDisableReturnObjectNotification)
{
if (message.find("been returned to your inventory") != -1)
{
return;
}
}
// </FS:PP>
// Build a link to open the object IM info window.
std::string location = ll_safe_string((char*)binary_bucket, binary_bucket_size-1);

9
indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
View File

@ -270,6 +270,15 @@
name="FSFlashOnScriptDialog"
top_pad="5"
width="160"/>
<check_box
control_name="FSDisableReturnObjectNotification"
height="16"
label="Disable 'object has been returned to your inventory' notifications"
layout="topleft"
left="10"
name="FSDisableReturnObjectNotification"
top_pad="2"
width="160"/>
<check_box
control_name="FSEnableGrowl"

1
indra/newview/skins/default/xui/pl/panel_preferences_alerts.xml
View File

@ -32,6 +32,7 @@
<check_box label="Przesyłaj skryptom powiad. o kolizjach na kanał:" name="FSReportCollisionMessages"/>
<spinner name="FSReportCollisionMessagesChannel" tool_tip="Kanał używany do przesyłania skryptom powiadomień o kolizjach [Domyślnie: -25000]"/>
<check_box label="Mrugaj ikoną aplikacji, gdy otwiera się okno dialogowe skryptu, a [APP_NAME] jest w tle" name="FSFlashOnScriptDialog"/>
<check_box label="Wyłącz powiadomienia mówiące o zwróceniu przedmiotów do szafy" name="FSDisableReturnObjectNotification"/>
<check_box label="Włącz powiadomienia Growl" name="notify_growl_checkbox"/>
<check_box label="Włącz Growl nawet gdy Firestorm jest aktywny" name="notify_growl_always_checkbox"/>
</panel>