diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-05-22 16:26:00 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-05-22 16:26:00 -0400 |
| commit | 1f0addf6e48c54ab33e0f02bab27cdf6e86d55fb (patch) | |
| tree | d24925b8260d4641961ad99829d54f775ed13c19 /indra/newview/lltoastpanel.cpp | |
| parent | 7637acf76e6a1170508e8bddd381c426d219b1ee (diff) | |
| parent | 8a9dba5443142873e99e2649eb280a0d17cd256e (diff) | |
merge changes for DRTVWR-152
Diffstat (limited to 'indra/newview/lltoastpanel.cpp')
| -rw-r--r-- | indra/newview/lltoastpanel.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/indra/newview/lltoastpanel.cpp b/indra/newview/lltoastpanel.cpp index d2a4ce8745..c33fde99c5 100644 --- a/indra/newview/lltoastpanel.cpp +++ b/indra/newview/lltoastpanel.cpp @@ -29,7 +29,9 @@ #include "llpanelgenerictip.h" #include "llpanelonlinestatus.h" #include "llnotifications.h" +#include "lltoastnotifypanel.h" #include "lltoastpanel.h" +#include "lltoastscriptquestion.h" //static const S32 LLToastPanel::MIN_PANEL_HEIGHT = 40; // VPAD(4)*2 + ICON_HEIGHT(32) @@ -106,6 +108,17 @@ LLToastPanel* LLToastPanel::buidPanelFromNotification( res = new LLPanelGenericTip(notification); } } + else if("notify" == notification->getType()) + { + if (notification->getPriority() == NOTIFICATION_PRIORITY_CRITICAL) + { + res = new LLToastScriptQuestion(notification); + } + else + { + res = new LLToastNotifyPanel(notification); + } + } /* else if(...) create all other specific non-public toast panel |