diff options
| author | callum <none@none> | 2009-12-14 14:10:16 -0800 |
|---|---|---|
| committer | callum <none@none> | 2009-12-14 14:10:16 -0800 |
| commit | 180daf3ab83ff9a83200c1952c0f09d20cfcb992 (patch) | |
| tree | 4591d743023244614678022269d80ef6d8097f63 /indra/lscript | |
| parent | 894a5006b3e5b4c725060443dab34491b0da3a4d (diff) | |
| parent | 5b6e4577ae6073650d78e1181ca5b60c527a7ae7 (diff) | |
Merge with Tip
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 |