summaryrefslogtreecommitdiff
path: root/indra/newview/llavatariconctrl.cpp
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2010-01-04 15:04:38 -0800
committerLeyla Farazha <leyla@lindenlab.com>2010-01-04 15:04:38 -0800
commit53abe3c7802b8c8579ce868b4ecb05d9ebdd20ef (patch)
tree4a2c9b325f6ceb75403db9d29e1efa583de434e3 /indra/newview/llavatariconctrl.cpp
parent34328eed67a10ccca73ec78cd70488ac35f2ee91 (diff)
parent1355d16d2f24f9d623df70059b1f0001cf673209 (diff)
Merge
Diffstat (limited to 'indra/newview/llavatariconctrl.cpp')
-rw-r--r--indra/newview/llavatariconctrl.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llavatariconctrl.cpp b/indra/newview/llavatariconctrl.cpp
index 44cbbbb6b2..42ae122ff9 100644
--- a/indra/newview/llavatariconctrl.cpp
+++ b/indra/newview/llavatariconctrl.cpp
@@ -38,7 +38,6 @@
#include "llavatarconstants.h"
#include "llcallingcard.h" // for LLAvatarTracker
#include "llavataractions.h"
-#include "llimview.h"
#include "llmenugl.h"
#include "lluictrlfactory.h"