diff options
| author | McCabe Maxsted | 2009-09-11 20:20:13 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-09-11 20:20:13 -0700 |
| commit | 23eb89d76a254235872b530e047c1f39df1d122a (patch) | |
| tree | 95c843ae96607d2c1221dcb49b266d154eae213a /linden/indra/llui/llpanel.h | |
| parent | Fixed profile account info spacing (diff) | |
| parent | Backported clickable object names from 1.23 (diff) | |
| download | meta-impy-23eb89d76a254235872b530e047c1f39df1d122a.zip meta-impy-23eb89d76a254235872b530e047c1f39df1d122a.tar.gz meta-impy-23eb89d76a254235872b530e047c1f39df1d122a.tar.bz2 meta-impy-23eb89d76a254235872b530e047c1f39df1d122a.tar.xz | |
Merged in 1.2.0-objectnames
Diffstat (limited to 'linden/indra/llui/llpanel.h')
| -rw-r--r-- | linden/indra/llui/llpanel.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/llui/llpanel.h b/linden/indra/llui/llpanel.h index 46022e5..8dea9b1 100644 --- a/linden/indra/llui/llpanel.h +++ b/linden/indra/llui/llpanel.h | |||
| @@ -220,7 +220,7 @@ public: | |||
| 220 | 220 | ||
| 221 | // LLButton | 221 | // LLButton |
| 222 | void childSetAction(const std::string& id, void(*function)(void*), void* value); | 222 | void childSetAction(const std::string& id, void(*function)(void*), void* value); |
| 223 | void childSetActionTextbox(const std::string& id, void(*function)(void*)); | 223 | void childSetActionTextbox(const std::string& id, void(*function)(void*), void* value = NULL); |
| 224 | void childSetControlName(const std::string& id, const std::string& control_name); | 224 | void childSetControlName(const std::string& id, const std::string& control_name); |
| 225 | 225 | ||
| 226 | // Error reporting | 226 | // Error reporting |