summaryrefslogtreecommitdiff
path: root/indra/newview/llimpanel.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2009-12-16 11:43:08 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2009-12-16 11:43:08 -0500
commit9813df87af1d895a3183eb33648009fd70ce6ed7 (patch)
tree4cb519a2402856c7ede8d5ba5e8feff798ea6bdb /indra/newview/llimpanel.cpp
parentadec0ba983c6b01c3d6c08692f3d5c7979ba90bb (diff)
parent073ec70829723e54f822052fe9c6c3e998e8dfca (diff)
merge
--HG-- branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llimpanel.cpp')
-rw-r--r--indra/newview/llimpanel.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp
index e6ded5f371..8b6762ce38 100644
--- a/indra/newview/llimpanel.cpp
+++ b/indra/newview/llimpanel.cpp
@@ -66,7 +66,6 @@
#include "llimview.h" // for LLIMModel to get other avatar id in chat
#include "llkeyboard.h"
#include "lllineeditor.h"
-#include "llnotify.h"
#include "llpanelimcontrolpanel.h"
#include "llrecentpeople.h"
#include "llresmgr.h"