diff options
| author | Samuel Kolb <skolb@lindenlab.com> | 2009-12-15 10:05:42 -0800 |
|---|---|---|
| committer | Samuel Kolb <skolb@lindenlab.com> | 2009-12-15 10:05:42 -0800 |
| commit | 82425a230c5ac7c0ca8a9ae55a1addadca9d99e9 (patch) | |
| tree | 8705515b0bd2e699980fe832f2fe6739fb5ad895 /indra/lscript | |
| parent | 941497dd30c409a2f352b0bfc1c48bfaca5ea76e (diff) | |
| parent | 60e6fa139e8056288514cfa7276eee9133953de9 (diff) | |
Merge
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 |