diff options
| author | Monroe Williams <monroe@lindenlab.com> | 2007-08-02 01:18:34 +0000 |
|---|---|---|
| committer | Monroe Williams <monroe@lindenlab.com> | 2007-08-02 01:18:34 +0000 |
| commit | 7138fb673ac3df46b9cb5f23d0d74e70fdd2b6b3 (patch) | |
| tree | 3c34a3a180b5275bd4166b0056765c5868f56447 /indra/newview/llviewercontrol.h | |
| parent | f6a10b3214d79df4e8f5768acaa68edbd2de5620 (diff) | |
Merge down from Branch_1-18-1:
svn merge --ignore-ancestry svn+ssh://svn.lindenlab.com/svn/linden/release@66449 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-1@67131
Diffstat (limited to 'indra/newview/llviewercontrol.h')
| -rw-r--r-- | indra/newview/llviewercontrol.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llviewercontrol.h b/indra/newview/llviewercontrol.h index 2203df4287..c93b62c75f 100644 --- a/indra/newview/llviewercontrol.h +++ b/indra/newview/llviewercontrol.h @@ -34,9 +34,11 @@ protected: LLTextEditor* mComment; }; +// These functions found in llcontroldef.cpp *TODO: clean this up! //setting variables are declared in this function void declare_settings(); void fixup_settings(); +void settings_setup_listeners(); // saved at end of session extern LLControlGroup gSavedSettings; |