diff options
author | Samuel Kolb <skolb@lindenlab.com> | 2009-12-16 12:04:38 -0800 |
---|---|---|
committer | Samuel Kolb <skolb@lindenlab.com> | 2009-12-16 12:04:38 -0800 |
commit | bedde40e9475f3772807b6fc48c3039d5993f578 (patch) | |
tree | ae615503b4c917667a5a0b752dd0a6eca2927e9b /indra/newview/llagent.cpp | |
parent | d7533a2c0646826088d5c1f58c84604c0607b8aa (diff) | |
parent | 0c0cb6fd79d12016b32bb74ce0e9d2c656143902 (diff) |
local 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 2b582c90f0..628982973c 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -38,7 +38,6 @@ #include "llagentlistener.h" #include "llagentwearables.h" #include "llagentui.h" - #include "llanimationstates.h" #include "llbottomtray.h" #include "llcallingcard.h" @@ -65,6 +64,7 @@ #include "llsky.h" #include "llsmoothstep.h" #include "llstatusbar.h" +#include "llteleportflags.h" #include "lltool.h" #include "lltoolmgr.h" #include "lltrans.h" |