v2 lscript merge

2011-06-16 23:56:56 -05:00
parent cfcc0a946d
commit 102ceaadfe
9 changed files with 74 additions and 106 deletions
--- 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