summaryrefslogtreecommitdiff
path: root/indra/newview/llagent.cpp
diff options
context:
space:
mode:
authorCallum Prentice <callum@lindenlab.com>2014-07-15 10:15:15 -0700
committerCallum Prentice <callum@lindenlab.com>2014-07-15 10:15:15 -0700
commitedec2d0559905d33907380d0b304b9e28f74082e (patch)
tree8f66c497878a24b488039f54b04f03960fbb6c96 /indra/newview/llagent.cpp
parentf11dd1d8a3dc4ba9a3c23563126e11ee971e219f (diff)
parent226929f8f5b8bc1080d0082b2595d689238df2b8 (diff)
Merge with viewer-release
Diffstat (limited to 'indra/newview/llagent.cpp')
-rwxr-xr-xindra/newview/llagent.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index aa8e0bad76..3d5f6c43ee 100755
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -47,6 +47,7 @@
#include "llfirstuse.h"
#include "llfloatercamera.h"
#include "llfloaterimcontainer.h"
+#include "llfloaterperms.h"
#include "llfloaterreg.h"
#include "llfloatertools.h"
#include "llgroupactions.h"