diff options
author | Richard Linden <none@none> | 2010-11-18 22:41:07 -0800 |
---|---|---|
committer | Richard Linden <none@none> | 2010-11-18 22:41:07 -0800 |
commit | db1af5b6cfcadd9f153cecb4d5440c69df2df7f0 (patch) | |
tree | 9965c78212f86a670563054ad4f71862d15e05a6 /indra/newview/llbrowsernotification.cpp | |
parent | ffa6d31707cea8de8b3853c23ff4a4fc07b65d60 (diff) | |
parent | a927b1cb0e0454cacf9523d2be7f2ce4b19c9e04 (diff) |
merge
Diffstat (limited to 'indra/newview/llbrowsernotification.cpp')
-rw-r--r-- | indra/newview/llbrowsernotification.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llbrowsernotification.cpp b/indra/newview/llbrowsernotification.cpp index d6a813d608..633ef4f1ce 100644 --- a/indra/newview/llbrowsernotification.cpp +++ b/indra/newview/llbrowsernotification.cpp @@ -29,8 +29,8 @@ #include "llnotificationhandler.h" #include "llnotifications.h" -#include "llfloaterreg.h" #include "llmediactrl.h" +#include "llviewermedia.h" using namespace LLNotificationsUI; |