summaryrefslogtreecommitdiff
path: root/indra/newview/lltoolmorph.cpp
diff options
context:
space:
mode:
authorNyx (Neal Orman) <nyx@lindenlab.com>2010-05-27 14:52:46 -0400
committerNyx (Neal Orman) <nyx@lindenlab.com>2010-05-27 14:52:46 -0400
commit9a0a68aa4468ccc072be0bf310ff2a5f4cd50f61 (patch)
tree324dc93040afe652fb2a1da4d617b794e0f2297f /indra/newview/lltoolmorph.cpp
parent7477f9054846e1d8a11d0e31c51bd35efa9b4c18 (diff)
parentcd46893057b9ec7d309059eff3f503cfaf46de56 (diff)
Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public
Diffstat (limited to 'indra/newview/lltoolmorph.cpp')
-rw-r--r--indra/newview/lltoolmorph.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/lltoolmorph.cpp b/indra/newview/lltoolmorph.cpp
index 22e15dcff2..c1dc1de5e5 100644
--- a/indra/newview/lltoolmorph.cpp
+++ b/indra/newview/lltoolmorph.cpp
@@ -49,7 +49,6 @@
#include "lldrawable.h"
#include "lldrawpoolavatar.h"
#include "llface.h"
-#include "llfloatercustomize.h"
#include "llmorphview.h"
#include "llresmgr.h"
#include "llselectmgr.h"