From 83bb4b9518da813a42e49366cea15e5ae9dc7507 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Thu, 16 Sep 2010 22:10:30 -0700 Subject: fixed merge --- indra/newview/llbrowsernotification.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/newview/llbrowsernotification.cpp') diff --git a/indra/newview/llbrowsernotification.cpp b/indra/newview/llbrowsernotification.cpp index cc54d10944..8eb0bb1e0b 100644 --- a/indra/newview/llbrowsernotification.cpp +++ b/indra/newview/llbrowsernotification.cpp @@ -28,9 +28,9 @@ #include "llviewerprecompiledheaders.h" // must be first include #include "llnotificationhandler.h" -#include "llnotifications.h" -#include "llfloatermediabrowser.h" -#include "llfloaterreg.h" +//#include "llnotifications.h" +//#include "llfloatermediabrowser.h" +//#include "llfloaterreg.h" using namespace LLNotificationsUI; -- cgit v1.2.3