diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-02-07 13:41:41 -0800 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-02-07 13:41:41 -0800 |
| commit | 867ef882fdf43dffd678722a8fdd77b618d13acf (patch) | |
| tree | d234b0f6e549539638e098c3bd84a469070116f8 /indra/newview/llagent.cpp | |
| parent | f3b1efae5d27d5597d3dc9468bce93679cae85e8 (diff) | |
| parent | cc235cdcc41fb1846b878769f5d4097ff9ad3b4d (diff) | |
merge changes for OPEN-292
Diffstat (limited to 'indra/newview/llagent.cpp')
| -rw-r--r-- | indra/newview/llagent.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 3f32be1d68..ee4c00a646 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -63,6 +63,7 @@ #include "llpaneltopinfobar.h" #include "llparcel.h" #include "llrendersphere.h" +#include "llscriptruntimeperms.h" #include "llsdmessage.h" #include "llsdutil.h" #include "llsky.h" @@ -92,7 +93,6 @@ #include "llwindow.h" #include "llworld.h" #include "llworldmap.h" -#include "lscript_byteformat.h" #include "stringize.h" #include "boost/foreach.hpp" |