diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-28 09:59:39 +0100 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-28 09:59:39 +0100 |
commit | d5d24548286ccdbc2008fbf8b5a4ea723063ecf0 (patch) | |
tree | 7cad61535554bd8fb333ea4b1e2ef34be8712f30 /indra/newview/llagent.cpp | |
parent | be6dc84b12c0c12975d8317604e5bff85fa14049 (diff) | |
parent | a7ffd8b7a3d26be6f1841f538631adbb0f3f5604 (diff) |
merge from viewer-public
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" |