diff options
| author | simon <none@none> | 2014-05-07 10:56:41 -0700 |
|---|---|---|
| committer | simon <none@none> | 2014-05-07 10:56:41 -0700 |
| commit | 250db74bf9325acdc1169f6c13d297e7fe44b753 (patch) | |
| tree | c6926efeefeb10ec3a36b296aa1ac7bd8521e0e3 /indra/newview/lltoastnotifypanel.cpp | |
| parent | 676bad148a72c235ec79742e3f490ca66b4f40d0 (diff) | |
| parent | d0ef02c23a7a37c8c9bfe3a86bae88bb811fc9fe (diff) | |
Pull and merge viewer-release as version 3.7.8
Diffstat (limited to 'indra/newview/lltoastnotifypanel.cpp')
| -rwxr-xr-x | indra/newview/lltoastnotifypanel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltoastnotifypanel.cpp b/indra/newview/lltoastnotifypanel.cpp index 9824f2dd38..51935dc03b 100755 --- a/indra/newview/lltoastnotifypanel.cpp +++ b/indra/newview/lltoastnotifypanel.cpp @@ -58,7 +58,7 @@ LLToastNotifyPanel::button_click_signal_t LLToastNotifyPanel::sButtonClickSignal LLToastNotifyPanel::LLToastNotifyPanel(const LLNotificationPtr& notification, const LLRect& rect, bool show_images) : LLToastPanel(notification), - LLInstanceTracker<LLToastNotifyPanel, LLUUID>(notification->getID()) + LLInstanceTracker<LLToastNotifyPanel, LLUUID, LLInstanceTrackerReplaceOnCollision>(notification->getID()) { init(rect, show_images); } |