From a7952d09291d256ef5713912f7d6e1acab7b4b50 Mon Sep 17 00:00:00 2001 From: Siana Gearz Date: Wed, 29 Jun 2011 00:37:14 +0000 Subject: [PATCH] CRTP fix for GCC 4.3 --- indra/newview/llnotify.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/newview/llnotify.cpp b/indra/newview/llnotify.cpp index ffd264b6c..afa2f84af 100644 --- a/indra/newview/llnotify.cpp +++ b/indra/newview/llnotify.cpp @@ -101,7 +101,7 @@ bool LLNotifyBox::onNotification(const LLSD& notify) //bring existing notification to top //This getInstance is ugly, as LLNotifyBox is derived from both LLInstanceTracker and LLEventTimer, which also is derived from its own LLInstanceTracker //Have to explicitly determine which getInstance function to use. - LLNotifyBox* boxp = LLNotifyBox::LLInstanceTracker::getInstance(notification->getID()); + LLNotifyBox* boxp = LLInstanceTracker::getInstance(notification->getID()); if (boxp && !boxp->isDead()) { gNotifyBoxView->showOnly(boxp); @@ -118,7 +118,7 @@ bool LLNotifyBox::onNotification(const LLSD& notify) } else if (notify["sigtype"].asString() == "delete") { - LLNotifyBox* boxp = LLNotifyBox::LLInstanceTracker::getInstance(notification->getID()); + LLNotifyBox* boxp = LLInstanceTracker::getInstance(notification->getID()); if (boxp && !boxp->isDead()) { boxp->close();