summaryrefslogtreecommitdiff
path: root/indra/newview/llagent.cpp
diff options
context:
space:
mode:
authorsimon <none@none>2014-07-07 14:49:45 -0700
committersimon <none@none>2014-07-07 14:49:45 -0700
commit3e6698073cedc8b24068147cf6b7091f081ea125 (patch)
tree59d8759c554af8a733668dae9668ca6fd92bf820 /indra/newview/llagent.cpp
parent770a0a2dea0bd503f88b35d3d440208bcd303e54 (diff)
parent226929f8f5b8bc1080d0082b2595d689238df2b8 (diff)
Merge viewer-release and become version 3.7.12
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 284b29199e..bd6025feea 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"