diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-12-11 16:01:44 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-12-11 16:01:44 -0500 |
| commit | 99590047eb322d76a90c417bf0e6b2ec0e189d52 (patch) | |
| tree | eaab40ba586d097bf5c1dd4b6ef673c1284ff477 /indra/lscript | |
| parent | d2b72fe0184fb92f4a79eebd242825fbcc5f32e9 (diff) | |
| parent | 1f3a55470919bf451f9c45b454d9bbf815a3e88a (diff) | |
automated merge avp->avp
--HG--
branch : avatar-pipeline
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 |