summaryrefslogtreecommitdiff
path: root/indra/newview/llagent.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2014-03-06 13:01:12 -0500
committerOz Linden <oz@lindenlab.com>2014-03-06 13:01:12 -0500
commit43eae437980226d62898c5f6fdb2a068f3b3c49b (patch)
tree64912b2398a34b9474e481d2d26f1afb124e7351 /indra/newview/llagent.cpp
parent9185f1e25602bb9bc4c2bf7923f2743effa281fa (diff)
parenta0f668c0a382ad4bd7a9be703bbcf1edd2bcf460 (diff)
merge changes for storm-68
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 f150ceda67..54e0375a2b 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"