diff options
| author | leyla <leyla@leyla.com> | 2010-06-02 11:24:40 -0700 |
|---|---|---|
| committer | leyla <leyla@leyla.com> | 2010-06-02 11:24:40 -0700 |
| commit | a282ffedf444462b71f5abc7aeac47768e7344e7 (patch) | |
| tree | 6634c6131809a23c3af36645ab220e97dd63f18e /indra/newview/llagent.cpp | |
| parent | 507410b63d2e8f5193443a8d5451ccf614ac85e7 (diff) | |
| parent | 28d23e8c85ba6073cffbd3597342c43f4f9c7971 (diff) | |
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" |