diff options
| author | James Cook <james@lindenlab.com> | 2009-12-11 10:22:50 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-12-11 10:22:50 -0800 |
| commit | a87b99cd950de20dc55e1ae6ce7186863a554326 (patch) | |
| tree | 43d1385397cbefac07934588824a3d0716fc6365 /indra/lscript/lscript_export.h | |
| parent | b26694f2ab4d88fb8a0e4b1f0e8733f111af4522 (diff) | |
| parent | c74d5c483cbd75c5e2a0b17c8980755a9932c53a (diff) | |
Merge, fixed conflict in panel_preferences_sound.xml
Diffstat (limited to 'indra/lscript/lscript_export.h')
| -rw-r--r-- | indra/lscript/lscript_export.h | 2 |
1 files changed, 1 insertions, 1 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 |
