diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-10-14 20:37:03 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-10-14 20:37:03 +0000 |
| commit | b5ffeaff1ab53008a8f1ee72cd1f398bd1ff21c2 (patch) | |
| tree | e12431a5c6945b2ece16765bcdb04c241c4d9a96 /indra/newview/llpanelgroupgeneral.cpp | |
| parent | 7475ec05fc81e358a6979f3e9d7050ab91511c57 (diff) | |
merge -r 2014-2032 https://svn.aws.productengine.com/secondlife/pe/stable-2 -> viewer-2.0.0-3
* Bugs: EXT-1005 EXT-1488 EXT-320 EXT-1236 EXT-1236 EXT-1002 EXT-1030
* New Dev: EXT-1293 EXT-1416
Diffstat (limited to 'indra/newview/llpanelgroupgeneral.cpp')
| -rw-r--r-- | indra/newview/llpanelgroupgeneral.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/indra/newview/llpanelgroupgeneral.cpp b/indra/newview/llpanelgroupgeneral.cpp index a6b67d668a..1c2875bf46 100644 --- a/indra/newview/llpanelgroupgeneral.cpp +++ b/indra/newview/llpanelgroupgeneral.cpp @@ -476,8 +476,15 @@ bool LLPanelGroupGeneral::confirmMatureApply(const LLSD& notification, const LLS // If we got here it means they set a valid value std::string mesg = ""; - apply(mesg); - return false; + bool ret = apply(mesg); + if ( !mesg.empty() ) + { + LLSD args; + args["MESSAGE"] = mesg; + LLNotifications::instance().add("GenericAlert", args); + } + + return ret; } // static |