diff options
author | skolb <none@none> | 2009-12-11 08:49:37 -0800 |
---|---|---|
committer | skolb <none@none> | 2009-12-11 08:49:37 -0800 |
commit | 6542ffe2f05c47d74dfbe659041d956d609f91f3 (patch) | |
tree | 7794c0737c5a78b0339c2c34b47c9d32c44de749 /indra/lscript | |
parent | 431bfca2ade364dc1165e402537e5e2d3616ebfd (diff) | |
parent | eda8634b17133df5f3104d96ad56d3626a90aad8 (diff) |
Merge viewer 2-0 into media
Diffstat (limited to 'indra/lscript')
-rw-r--r-- | indra/lscript/lscript_export.h | 2 | ||||
-rw-r--r-- | indra/lscript/lscript_library.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/indra/lscript/lscript_export.h b/indra/lscript/lscript_export.h index d4626a8cd2..4c883582e2 100644 --- a/indra/lscript/lscript_export.h +++ b/indra/lscript/lscript_export.h @@ -35,6 +35,6 @@ #include "lscript_library.h" -extern LLScriptLibrary gScriptLibrary; + #endif diff --git a/indra/lscript/lscript_library.h b/indra/lscript/lscript_library.h index 6728d70d0a..363d11f3aa 100644 --- a/indra/lscript/lscript_library.h +++ b/indra/lscript/lscript_library.h @@ -70,7 +70,7 @@ public: std::vector<LLScriptLibraryFunction> mFunctions; }; -extern LLScriptLibrary gScriptLibrary; + class LLScriptLibData { @@ -428,4 +428,6 @@ public: }; +extern LLScriptLibrary gScriptLibrary; + #endif |