diff options
| author | Aimee Linden <aimee@lindenlab.com> | 2010-05-28 17:19:20 +0100 |
|---|---|---|
| committer | Aimee Linden <aimee@lindenlab.com> | 2010-05-28 17:19:20 +0100 |
| commit | 24a867a646a979d48cf5f4c94eae041507a09310 (patch) | |
| tree | 5f963caa5c9fd69e3ef0669220cc736cf472d8a4 /indra/newview/llagent.cpp | |
| parent | 176b5c5a67c3bd34da787c7446d7349dc1937803 (diff) | |
| parent | 7983de22074beb25a832f89aa3e7a9728baca328 (diff) | |
Merged from ssh://hg.lindenlab.com/dessie/viewer-private
Diffstat (limited to 'indra/newview/llagent.cpp')
| -rw-r--r-- | indra/newview/llagent.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 7d84f8d071..0fa77ff7c2 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -45,7 +45,6 @@ #include "llchannelmanager.h" #include "llconsole.h" #include "llfloatercamera.h" -#include "llfloatercustomize.h" #include "llfloaterreg.h" #include "llfloatertools.h" #include "llgroupactions.h" @@ -73,6 +72,7 @@ #include "llviewerdisplay.h" #include "llviewerjoystick.h" #include "llviewermediafocus.h" +#include "llviewermenu.h" #include "llviewerobjectlist.h" #include "llviewerparcelmgr.h" #include "llviewerstats.h" |