summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterfriends.cpp
diff options
context:
space:
mode:
authorEric M. Tulla (BigPapi) <tulla@lindenlab.com>2009-12-15 16:21:10 -0500
committerEric M. Tulla (BigPapi) <tulla@lindenlab.com>2009-12-15 16:21:10 -0500
commit89a8182c2cd8d04b85c70d82f654714b83afebb8 (patch)
treeb96828988ee88dd86c6ac61f984a20a85aa62c92 /indra/newview/llfloaterfriends.cpp
parent0f5a7575407bcab51678a4f05884835e502cd3d3 (diff)
parenteafd52200d1c101c918384066465638f400aa033 (diff)
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview/llfloaterfriends.cpp')
-rw-r--r--indra/newview/llfloaterfriends.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llfloaterfriends.cpp b/indra/newview/llfloaterfriends.cpp
index 1482d3fe21..56291c57a6 100644
--- a/indra/newview/llfloaterfriends.cpp
+++ b/indra/newview/llfloaterfriends.cpp
@@ -50,7 +50,6 @@
#include "llinventorymodel.h"
#include "llnamelistctrl.h"
#include "llnotificationsutil.h"
-#include "llnotify.h"
#include "llresmgr.h"
#include "llscrolllistctrl.h"
#include "llscrolllistitem.h"