diff options
| author | Richard Linden <none@none> | 2010-09-16 22:10:30 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-09-16 22:10:30 -0700 |
| commit | 83bb4b9518da813a42e49366cea15e5ae9dc7507 (patch) | |
| tree | 395372dc049dc2ea06dcd977a8b71befbda37fe0 /indra/newview/llbrowsernotification.cpp | |
| parent | 1911993cc7761216c70b95e77b49da383c9e162d (diff) | |
fixed merge
Diffstat (limited to 'indra/newview/llbrowsernotification.cpp')
| -rw-r--r-- | indra/newview/llbrowsernotification.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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; |