diff options
| author | Eli Linden <eli@lindenlab.com> | 2010-05-27 13:49:18 -0700 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2010-05-27 13:49:18 -0700 |
| commit | 2a061dbccc7ecadce7470ee272b6b10c5d551ff4 (patch) | |
| tree | 1cdc2485f39c4871d94f348de746de7b5c7febe0 /indra/newview/llagent.cpp | |
| parent | d01b99adea6b15f751395f89035803275791855a (diff) | |
| parent | 9a0a68aa4468ccc072be0bf310ff2a5f4cd50f61 (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" |