3 files changed, 11 insertions, 2 deletions

diff --git a/linden/indra/newview/llfloaternotificationsconsole.cpp b/linden/indra/newview/llfloaternotificationsconsole.cpp
index e625006..15ae3d4 100644
--- a/linden/indra/newview/llfloaternotificationsconsole.cpp
+++ b/linden/indra/newview/llfloaternotificationsconsole.cpp
@@ -187,6 +187,7 @@ BOOL LLFloaterNotificationConsole::postBuild()
         addChannel("NotificationTips");
 
         getChild<LLButton>("add_notification")->setClickedCallback(onClickAdd, this);
+        getChild<LLButton>("reload_notifications")->setClickedCallback(onClickReload, this);
 
         LLComboBox* notifications = getChild<LLComboBox>("notification_types");
         LLNotifications::TemplateNames names = LLNotifications::instance().getTemplateNames();
@@ -244,6 +245,12 @@ void LLFloaterNotificationConsole::onClickAdd(void* user_data)
         }
 }
 
+void LLFloaterNotificationConsole::onClickReload(void* user_data)
+{
+        // Reload notifications.xml. Old used notifications are preserved in the history for the session -- MC
+        LLNotifications::instance().loadTemplates();
+}
+
 
 //=============== LLFloaterNotification ================
 
diff --git a/linden/indra/newview/llfloaternotificationsconsole.h b/linden/indra/newview/llfloaternotificationsconsole.h
index 1a436b8..67c6191 100644
--- a/linden/indra/newview/llfloaternotificationsconsole.h
+++ b/linden/indra/newview/llfloaternotificationsconsole.h
@@ -55,6 +55,7 @@ public:
 
 private:
         static void onClickAdd(void* user_data);
+        static void onClickReload(void* user_data);
 };
 
 
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_notifications_console.xml b/linden/indra/newview/skins/default/xui/en-us/floater_notifications_console.xml
index 7186bb4..7c53696 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_notifications_console.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_notifications_console.xml
@@ -2,8 +2,9 @@
 <floater bottom="100" can_close="true" can_drag_on_left="false" can_minimize="true"
      can_resize="true" enabled="true" height="500" left="176" title="Notifications Console" min_height="50"
      min_width="100" mouse_opaque="true" name="notifications_console" width="500">
-  <combo_box name="notification_types" left="2" bottom="-40" height="18" width="440" follows="left|right|top" label="Select notification type"/>
-  <button name="add_notification" left="445" bottom="-40" height="18" width="50" follows="right|top" label="Add"/>
+  <combo_box name="notification_types" left="2" bottom="-40" height="18" width="345" follows="left|right|top" label="Select notification type"/>
+  <button name="add_notification" left="352" bottom="-40" height="20" width="50" follows="right|top" label="Add"/>
+  <button name="reload_notifications" left="405" bottom="-40" height="20" width="90" follows="right|top" label="Reload All"/>
   <layout_stack name="notification_channels" left="5" right="-5" top="-42" bottom="5" follows="left|right|top|bottom" orientation="vertical">
   </layout_stack>
 </floater>