summaryrefslogtreecommitdiff
path: root/indra/newview/lltoastpanel.cpp
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2013-11-12 14:06:38 -0500
committerMonty Brandenberg <monty@lindenlab.com>2013-11-12 14:06:38 -0500
commitd191585a3eec778e36e5f0c4b620c3d525c86c42 (patch)
tree2612c0d1947e00d9ceba82b054a7a90113ffa752 /indra/newview/lltoastpanel.cpp
parentac1d3a22f2034a5e3aba757bde72825643fa799c (diff)
parentebc9bcbf69f7a519677a6522979a6bf6cbb04bb8 (diff)
Merge. Refresh from viewer-release after 3.6.10 release
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();