summaryrefslogtreecommitdiff
path: root/indra/newview/lltoastpanel.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2013-10-28 20:06:18 -0400
committerNat Goodspeed <nat@lindenlab.com>2013-10-28 20:06:18 -0400
commit57040ea70e21ea5cfaedfd8a3506362a03562552 (patch)
treeeb9dc090ab72bea2353de8a940ccdc7ab69d830e /indra/newview/lltoastpanel.cpp
parent8881b47d22a7cd17824e8162e0658af71bbe3dea (diff)
parentd5877bc365292358eb4c9b8d14d1c8a1237ca5bd (diff)
Automated merge with http://bitbucket.org/nat_linden/viewer-maint-3331
Diffstat (limited to 'indra/newview/lltoastpanel.cpp')
-rwxr-xr-xindra/newview/lltoastpanel.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/lltoastpanel.cpp b/indra/newview/lltoastpanel.cpp
index a30f841980..e1b764a943 100755
--- a/indra/newview/lltoastpanel.cpp
+++ b/indra/newview/lltoastpanel.cpp
@@ -53,6 +53,12 @@ std::string LLToastPanel::getTitle()
}
//virtual
+const std::string& LLToastPanel::getNotificationName()
+{
+ return mNotification->getName();
+}
+
+//virtual
const LLUUID& LLToastPanel::getID()
{
return mNotification->id();