diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-05-28 10:41:17 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-05-28 10:41:17 -0400 |
| commit | 955698c7a6d04c1ed895bfc2b9b5acf4e8d5473e (patch) | |
| tree | 9600f378eae7f0a8e5bd5b8d309db2d187b2eaaa /indra/newview/llagent.cpp | |
| parent | 9cbd65d67966db823b91aa4f133625f978907b74 (diff) | |
| parent | 7e0b36d6102f5e285296cd8e0dc6961b5c73c7cb (diff) | |
automated merge
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" |