diff options
| author | Armin Weatherwax | 2010-06-14 12:04:49 +0200 |
|---|---|---|
| committer | Armin Weatherwax | 2010-09-23 15:38:25 +0200 |
| commit | 35df5441d3e2789663532c948731aff3a1e04728 (patch) | |
| tree | ac7674289784a5f96106ea507637055a8dada78a /linden/indra/llui/llbutton.h | |
| parent | Changed version to Experimental 2010.09.18 (diff) | |
| download | meta-impy-35df5441d3e2789663532c948731aff3a1e04728.zip meta-impy-35df5441d3e2789663532c948731aff3a1e04728.tar.gz meta-impy-35df5441d3e2789663532c948731aff3a1e04728.tar.bz2 meta-impy-35df5441d3e2789663532c948731aff3a1e04728.tar.xz | |
llmediaplugins first step
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/llui/llbutton.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linden/indra/llui/llbutton.h b/linden/indra/llui/llbutton.h index 724b775..2174d95 100644 --- a/linden/indra/llui/llbutton.h +++ b/linden/indra/llui/llbutton.h | |||
| @@ -136,7 +136,8 @@ public: | |||
| 136 | 136 | ||
| 137 | void setImageColor(const std::string& color_control); | 137 | void setImageColor(const std::string& color_control); |
| 138 | void setImageColor(const LLColor4& c); | 138 | void setImageColor(const LLColor4& c); |
| 139 | virtual void setColor(const LLColor4& c); | 139 | /*virtual*/ void setColor(const LLColor4& c); |
| 140 | /*virtual*/ void setAlpha(F32 alpha); | ||
| 140 | 141 | ||
| 141 | void setImages(const std::string &image_name, const std::string &selected_name); | 142 | void setImages(const std::string &image_name, const std::string &selected_name); |
| 142 | void setDisabledImages(const std::string &image_name, const std::string &selected_name); | 143 | void setDisabledImages(const std::string &image_name, const std::string &selected_name); |