summaryrefslogtreecommitdiff
path: root/indra/newview/llagent.cpp
diff options
context:
space:
mode:
authorrichard <none@none>2009-12-17 10:03:56 -0800
committerrichard <none@none>2009-12-17 10:03:56 -0800
commit724f5fbb7f7b101774c0cf3ff43bb98f9cc4ffc1 (patch)
treebfb7b4009b32761f9f760f97dd97cc0697667a71 /indra/newview/llagent.cpp
parent9ff869a6b287a2b4b8c94219584d1c7b66ebb399 (diff)
parentcf63ce4dc1176d9df4fe852821e4a6d32332f7c6 (diff)
merge
Diffstat (limited to 'indra/newview/llagent.cpp')
-rw-r--r--indra/newview/llagent.cpp2
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"