diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2011-09-07 15:36:45 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2011-09-07 15:36:45 -0400 |
| commit | de2b7cd28c8e8669291b7ca21ecc9602f2044eeb (patch) | |
| tree | ef49168d82db407383c64ea1d4f21f96512b15e0 /indra/newview/llviewercontrollistener.h | |
| parent | 8c6f752982e83a50e328b9c83f762721f38836d7 (diff) | |
| parent | b59c0a668009e696295a194e118b91469b09d32e (diff) | |
Automated merge with ssh://hg.lindenlab.com/nat/viewer-storm-1541
Diffstat (limited to 'indra/newview/llviewercontrollistener.h')
| -rw-r--r-- | indra/newview/llviewercontrollistener.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llviewercontrollistener.h b/indra/newview/llviewercontrollistener.h index fd211b97af..2e72046924 100644 --- a/indra/newview/llviewercontrollistener.h +++ b/indra/newview/llviewercontrollistener.h @@ -40,11 +40,11 @@ public: LLViewerControlListener(); private: - static void set(LLControlGroup *controls, LLSD const & event_data); - static void toggleControl(LLControlGroup *controls, LLSD const & event_data); - static void setDefault(LLControlGroup *controls, LLSD const & event_data); + static void set(LLSD const & event_data); + static void toggle(LLSD const & event_data); + static void get(LLSD const & event_data); + static void groups(LLSD const & event_data); + static void vars(LLSD const & event_data); }; -extern LLViewerControlListener gSavedSettingsListener; - #endif // LL_LLVIEWERCONTROLLISTENER_H |