diff options
| author | Jacek Antonelli | 2008-09-06 18:24:57 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-09-06 18:25:07 -0500 |
| commit | 798d367d54a6c6379ad355bd8345fa40e31e7fe9 (patch) | |
| tree | 1921f1708cd0240648c97bc02df2c2ab5f2fc41e /linden/indra/newview/llfloaterwindlight.h | |
| parent | Second Life viewer sources 1.20.15 (diff) | |
| download | meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.zip meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.gz meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.bz2 meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.xz | |
Second Life viewer sources 1.21.0-RC
Diffstat (limited to 'linden/indra/newview/llfloaterwindlight.h')
| -rw-r--r-- | linden/indra/newview/llfloaterwindlight.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/llfloaterwindlight.h b/linden/indra/newview/llfloaterwindlight.h index 2dbabdb..94373ca 100644 --- a/linden/indra/newview/llfloaterwindlight.h +++ b/linden/indra/newview/llfloaterwindlight.h | |||
| @@ -61,9 +61,9 @@ public: | |||
| 61 | 61 | ||
| 62 | // help button stuff | 62 | // help button stuff |
| 63 | static void onClickHelp(void* data); | 63 | static void onClickHelp(void* data); |
| 64 | void initHelpBtn(const char* name, const char* xml_alert); | 64 | void initHelpBtn(const std::string& name, const std::string& xml_alert); |
| 65 | 65 | ||
| 66 | static void newPromptCallback(S32 option, const LLString& text, void* userData); | 66 | static void newPromptCallback(S32 option, const std::string& text, void* userData); |
| 67 | 67 | ||
| 68 | /// general purpose callbacks for dealing with color controllers | 68 | /// general purpose callbacks for dealing with color controllers |
| 69 | static void onColorControlRMoved(LLUICtrl* ctrl, void* userData); | 69 | static void onColorControlRMoved(LLUICtrl* ctrl, void* userData); |