diff options
| author | Palmer Truelson <palmer@lindenlab.com> | 2009-12-14 11:44:48 -0600 |
|---|---|---|
| committer | Palmer Truelson <palmer@lindenlab.com> | 2009-12-14 11:44:48 -0600 |
| commit | de38b58f37d6c7dadd4a5f15be519cb0bb230fc7 (patch) | |
| tree | fdfe34a8be0e2086c1e9407931af85f5f8c2fc39 /indra/lscript | |
| parent | fadfa09e6d3bbff9ebae0aabeacf26a83aae4ad7 (diff) | |
| parent | a9e409c7071ba74f01158aa7b876a1ad60161fc4 (diff) | |
Merging in latest viewer 2
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 |