diff options
author | Oz Linden <oz@lindenlab.com> | 2012-06-27 08:10:29 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2012-06-27 08:10:29 -0400 |
commit | 5ed8ec6ca45fcae6a6708e55326010fd8c05d76c (patch) | |
tree | 433af79631cf0f386c6cf991cb01e119d5187009 /indra/newview/lltoastnotifypanel.cpp | |
parent | a4913246770b58ed569021c484c213231aaae549 (diff) | |
parent | 90547ff411db177bf6424ca553449a81a808fc0f (diff) |
merge up to 3.3.3-release
Diffstat (limited to 'indra/newview/lltoastnotifypanel.cpp')
-rw-r--r-- | indra/newview/lltoastnotifypanel.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lltoastnotifypanel.cpp b/indra/newview/lltoastnotifypanel.cpp index a8060649ba..a473ee7ce0 100644 --- a/indra/newview/lltoastnotifypanel.cpp +++ b/indra/newview/lltoastnotifypanel.cpp @@ -52,7 +52,7 @@ const LLFontGL* LLToastNotifyPanel::sFontSmall = NULL; LLToastNotifyPanel::button_click_signal_t LLToastNotifyPanel::sButtonClickSignal; -LLToastNotifyPanel::LLToastNotifyPanel(LLNotificationPtr& notification, const LLRect& rect, bool show_images) : +LLToastNotifyPanel::LLToastNotifyPanel(const LLNotificationPtr& notification, const LLRect& rect, bool show_images) : LLToastPanel(notification), mTextBox(NULL), mInfoPanel(NULL), @@ -536,7 +536,7 @@ void LLToastNotifyPanel::onToastPanelButtonClicked(const LLUUID& notification_id } } -void LLToastNotifyPanel::disableRespondedOptions(LLNotificationPtr& notification) +void LLToastNotifyPanel::disableRespondedOptions(const LLNotificationPtr& notification) { LLSD response = notification->getResponse(); for (LLSD::map_const_iterator response_it = response.beginMap(); |