diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-08-29 06:23:41 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-08-29 06:23:41 +0000 |
| commit | a1ed9ccf7330354d5df5083b44643f2a7e56b748 (patch) | |
| tree | 75caa29925495a74548111da1800d67126343d13 /indra/lscript/lscript_library.h | |
| parent | c4384d64a11fe96764f240a9e220989ad5546f16 (diff) | |
Partial merge of: viewer-2.0.0-3@131138 texture-pipeline-3@131862 -> viewer-2.0.0-3
Includes:
* DEV-31909 VWR-13251: Revise lscript_library.cpp to allow localization of LSL editor hovertips
* DEV-21938 llSHA1String does not appear where expected in the dropdown "Insert" menu in the LSL editor
* Some cleanup to llerror so that it doesn't depend on llfixedbuffer
* A few misc. server specific changes not related to the texture-pipeline changes (llapp, lloptioninterface)
Diffstat (limited to 'indra/lscript/lscript_library.h')
| -rw-r--r-- | indra/lscript/lscript_library.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/indra/lscript/lscript_library.h b/indra/lscript/lscript_library.h index fa3b06b7d9..6728d70d0a 100644 --- a/indra/lscript/lscript_library.h +++ b/indra/lscript/lscript_library.h @@ -44,7 +44,7 @@ class LLScriptLibData; class LLScriptLibraryFunction { public: - LLScriptLibraryFunction(F32 eu, F32 st, void (*exec_func)(LLScriptLibData *, LLScriptLibData *, const LLUUID &), const char *name, const char *ret_type, const char *args, const char *desc, BOOL god_only = FALSE); + LLScriptLibraryFunction(F32 eu, F32 st, void (*exec_func)(LLScriptLibData *, LLScriptLibData *, const LLUUID &), const char *name, const char *ret_type, const char *args, BOOL god_only = FALSE); ~LLScriptLibraryFunction(); F32 mEnergyUse; @@ -53,7 +53,6 @@ public: const char *mName; const char *mReturnType; const char *mArgs; - const char *mDesc; BOOL mGodOnly; }; @@ -65,11 +64,10 @@ public: void init(); - void addFunction(LLScriptLibraryFunction *func); + void addFunction(F32 eu, F32 st, void (*exec_func)(LLScriptLibData *, LLScriptLibData *, const LLUUID &), const char *name, const char *ret_type, const char *args, BOOL god_only = FALSE); void assignExec(const char *name, void (*exec_func)(LLScriptLibData *, LLScriptLibData *, const LLUUID &)); - S32 mNextNumber; - LLScriptLibraryFunction **mFunctions; + std::vector<LLScriptLibraryFunction> mFunctions; }; extern LLScriptLibrary gScriptLibrary; |