diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-12-10 14:04:45 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-12-10 14:04:45 -0500 |
| commit | 9dfcc83098efec8590c3bdb19da76092955b7e0a (patch) | |
| tree | 7bb5f7c32c99f79d36d648fda6d732769503ed53 /indra/lscript | |
| parent | 0d186b07121b110bf86a36cd157359f0733a5ee4 (diff) | |
| parent | f6a1858884958a67e68227d8078076681e7d478d (diff) | |
automated merge viewer2.0->viewer2.0
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 |