summaryrefslogtreecommitdiff
path: root/indra/lscript
diff options
context:
space:
mode:
authorbrad kittenbrink <brad@lindenlab.com>2009-08-27 16:25:02 -0400
committerbrad kittenbrink <brad@lindenlab.com>2009-08-27 16:25:02 -0400
commitd020dae7b9c156a08d1dd17eade7f36011f4d0fe (patch)
tree67b1a28222116b20c5fa7bcc1cbd86ca47a91aa7 /indra/lscript
parent745845f79987e4b4ab7f5728746a0eda8898930f (diff)
parent70600ea66adc816e72e91e804deebde40ed6b1bc (diff)
Merged latest login-api with latest viewer-2.0.0-3 up through plugin-api-05 merge (r131929).
Some minor post-merge cleanups still required.
Diffstat (limited to 'indra/lscript')
-rw-r--r--indra/lscript/lscript_execute/llscriptresource.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/lscript/lscript_execute/llscriptresource.cpp b/indra/lscript/lscript_execute/llscriptresource.cpp
index 6c4776c2e4..cd3696ab3f 100644
--- a/indra/lscript/lscript_execute/llscriptresource.cpp
+++ b/indra/lscript/lscript_execute/llscriptresource.cpp
@@ -30,6 +30,8 @@
* $/LicenseInfo$
*/
+#include "linden_common.h"
+
#include "llscriptresource.h"
#include "llerror.h"