diff options
| author | Graham Linden <graham@lindenlab.com> | 2013-10-25 11:48:43 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2013-10-25 11:48:43 -0700 |
| commit | 970ee73e9a9cd1c94c295c9decb4d632886c19e6 (patch) | |
| tree | 18cc7f08bbc043252bea9a6f687807116585d286 /indra/newview/lltoastpanel.cpp | |
| parent | d4e622daf2775147c75a75389ffb9b55f8cef799 (diff) | |
Fix release merge issues (included upstream changes not yet in release from bear)
Diffstat (limited to 'indra/newview/lltoastpanel.cpp')
| -rwxr-xr-x | indra/newview/lltoastpanel.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/indra/newview/lltoastpanel.cpp b/indra/newview/lltoastpanel.cpp index e1b764a943..a30f841980 100755 --- a/indra/newview/lltoastpanel.cpp +++ b/indra/newview/lltoastpanel.cpp @@ -53,12 +53,6 @@ std::string LLToastPanel::getTitle() } //virtual -const std::string& LLToastPanel::getNotificationName() -{ - return mNotification->getName(); -} - -//virtual const LLUUID& LLToastPanel::getID() { return mNotification->id(); |