diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 6809d8615c..b7b48c95b6 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -21480,5 +21480,16 @@ Change of this parameter will affect the layout of buttons in notification toast
       <key>Value</key>
       <integer>5</integer>
     </map>
+    <key>FSFlashOnScriptDialog</key>
+    <map>
+      <key>Comment</key>
+      <string>Flash/Bounce the app icon when a script dialog is received and Firestorm is not in focus</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/llscriptfloater.cpp b/indra/newview/llscriptfloater.cpp
index 007ddc354f..4f9f4405da 100755
--- a/indra/newview/llscriptfloater.cpp
+++ b/indra/newview/llscriptfloater.cpp
@@ -43,6 +43,7 @@
 #include "llviewerwindow.h"
 #include "llfloaterimsession.h"
 
+#include "llwindow.h"	// <FS:CR> flashIcon()
 #include "lltoolbarview.h"		// <FS:Zi> script dialogs position
 // <FS:Zi> Dialog Stacking browser
 #include "dialogstack.h"
@@ -571,6 +572,14 @@ void LLScriptFloaterManager::onAddNotification(const LLUUID& notification_id)
 	data["new_message"] = set_new_message;
 	data["unread"] = 1; // each object has got only one floater
 	mNewObjectSignal(data);
+	
+	// <FS:CR> Flash or bounce the app icon on new script dialog
+	LLWindow* viewer_window = gViewerWindow->getWindow();
+	if (viewer_window && gSavedSettings.getBOOL("FSFlashOnScriptDialog"))
+	{
+		viewer_window->flashIcon(5.f);
+	}
+	// </FS:CR>
 
 	toggleScriptFloater(notification_id, set_new_message);
 }
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
index f2554038f2..5e0ae8e2a6 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
@@ -261,6 +261,15 @@
       name="FSReportCollisionMessagesChannel"
       width="90"
       tool_tip="The channel used for reporting collision messages to scripts [Default: -25000]"/>
+    <check_box
+     control_name="FSFlashOnScriptDialog"
+     height="16"
+     label="Flash the app icon when receiving a script dialog and [APP_NAME] is not in focus"
+     layout="topleft"
+     left="10"
+     name="notify_growl_checkbox"
+     top_pad="5"
+     width="160"/>
       
     <check_box
       control_name="FSEnableGrowl"
@@ -269,7 +278,7 @@
       layout="topleft"
       left="10"
       name="notify_growl_checkbox"
-      top_pad="16"
+      top_pad="8"
       width="160"/>
     <check_box
       enabled_control="FSEnableGrowl"