diff options
| author | Richard Linden <none@none> | 2013-11-06 17:22:04 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-11-06 17:22:04 -0800 |
| commit | fe518bde8e6db65d3d6b178c200410b1346639a4 (patch) | |
| tree | d738e12f8391a675d36aae9d59ced8104846008c /indra/newview/lltoastnotifypanel.cpp | |
| parent | ea1e1b0925b386cf83178539b8eae9e25c573548 (diff) | |
| parent | d9d46d908c0573dbcd45ec2a1bea56966823343b (diff) | |
merge with release
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 94d07b37ef..5b110d843d 100755 --- a/indra/newview/lltoastnotifypanel.cpp +++ b/indra/newview/lltoastnotifypanel.cpp @@ -57,7 +57,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, LLInstanceTrackerAllowKeyCollisions>(notification->getID()) { init(rect, show_images); } |