summaryrefslogtreecommitdiff
path: root/indra/newview/llinventoryobserver.cpp
diff options
context:
space:
mode:
authorSamuel Kolb <skolb@lindenlab.com>2009-11-30 09:11:04 -0800
committerSamuel Kolb <skolb@lindenlab.com>2009-11-30 09:11:04 -0800
commite2699c64a20262f6fbe6c1432294e8428e8cda5d (patch)
tree5b14a249342021b220df723a91c3e78d2c91f06e /indra/newview/llinventoryobserver.cpp
parent6824800fa0001cd4a23a4f98b099af34435b0e06 (diff)
parentd4e01315e3f39dd14bb2c14f09e4e94749542b06 (diff)
merge viewer-2-0 into media
Diffstat (limited to 'indra/newview/llinventoryobserver.cpp')
-rw-r--r--indra/newview/llinventoryobserver.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llinventoryobserver.cpp b/indra/newview/llinventoryobserver.cpp
index 06f4b36df3..944676ad7a 100644
--- a/indra/newview/llinventoryobserver.cpp
+++ b/indra/newview/llinventoryobserver.cpp
@@ -55,7 +55,7 @@
#include "lldbstrings.h"
#include "llviewerstats.h"
#include "llmutelist.h"
-#include "llnotifications.h"
+#include "llnotificationsutil.h"
#include "llcallbacklist.h"
#include "llpreview.h"
#include "llviewercontrol.h"