summaryrefslogtreecommitdiff
path: root/indra/newview/llagent.cpp
diff options
context:
space:
mode:
authormaksymsproductengine <maksymsproductengine@lindenlab.com>2014-07-10 00:23:01 +0300
committermaksymsproductengine <maksymsproductengine@lindenlab.com>2014-07-10 00:23:01 +0300
commit58c86cf59ee26dbadd359a28d8b16409c856e966 (patch)
tree55d22b0f408f7b0bcda4b5dcefb12ff47bcfd286 /indra/newview/llagent.cpp
parent70c2472e427c2d58edd857d298ea9f1fbe4bd41f (diff)
parent226929f8f5b8bc1080d0082b2595d689238df2b8 (diff)
merge changes for 3.7.12-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"