diff options
| author | Robin Cornelius | 2010-10-10 21:53:54 +0100 |
|---|---|---|
| committer | Robin Cornelius | 2010-10-10 21:53:54 +0100 |
| commit | c0034c520c6e61b64822e276316651ec6912bd98 (patch) | |
| tree | 910442027b6a2c1406d80ca93949755b54badf5c /linden/indra/llui/lliconctrl.h | |
| parent | Use all those cores for compile (diff) | |
| parent | Thickbrick Sleaford, Soft Linden: STORM-164 make gcc-4.4 happy about llvosky.h (diff) | |
| download | meta-impy-c0034c520c6e61b64822e276316651ec6912bd98.zip meta-impy-c0034c520c6e61b64822e276316651ec6912bd98.tar.gz meta-impy-c0034c520c6e61b64822e276316651ec6912bd98.tar.bz2 meta-impy-c0034c520c6e61b64822e276316651ec6912bd98.tar.xz | |
Merge branch 'mccabe-plugins' into plugins_merge
Conflicts:
linden/doc/contributions.txt
linden/indra/cmake/GStreamer.cmake
linden/indra/cmake/LLMedia.cmake
linden/indra/cmake/OPENAL.cmake
linden/indra/llmedia/CMakeLists.txt
linden/indra/llprimitive/material_codes.h
linden/indra/newview/chatbar_as_cmdline.cpp
linden/indra/newview/llappviewer.cpp
linden/indra/newview/llfloatertos.cpp
linden/indra/newview/llstartup.cpp
linden/indra/newview/llviewerwindow.cpp
linden/indra/newview/llvoavatar.cpp
linden/indra/newview/pipeline.cpp
linden/indra/newview/pipeline.h
linden/indra/newview/viewer_manifest.py
linden/install.xml
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/llui/lliconctrl.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/linden/indra/llui/lliconctrl.h b/linden/indra/llui/lliconctrl.h index 50778cf..2506fb2 100644 --- a/linden/indra/llui/lliconctrl.h +++ b/linden/indra/llui/lliconctrl.h | |||
| @@ -65,6 +65,8 @@ public: | |||
| 65 | virtual void setValue(const LLSD& value ); | 65 | virtual void setValue(const LLSD& value ); |
| 66 | virtual LLSD getValue() const; | 66 | virtual LLSD getValue() const; |
| 67 | 67 | ||
| 68 | /*virtual*/ void setAlpha(F32 alpha); | ||
| 69 | |||
| 68 | void setColor(const LLColor4& color) { mColor = color; } | 70 | void setColor(const LLColor4& color) { mColor = color; } |
| 69 | 71 | ||
| 70 | virtual LLXMLNodePtr getXML(bool save_children = true) const; | 72 | virtual LLXMLNodePtr getXML(bool save_children = true) const; |