diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 14:12:18 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 14:12:18 -0800 |
| commit | 0ac14158bcec40e65fb26d2fea7555ede1e2ca94 (patch) | |
| tree | bacf3b28ac4de7f69da67d7616923dafe92b0d49 /indra/llui/lltabcontainer.h | |
| parent | 92cef0426df15c0e661fa795e6b00214f381dd05 (diff) | |
| parent | ab0c9c6754836cb26a520d0a9b2d7bbdd13a5f32 (diff) | |
automated merge from trunk
Diffstat (limited to 'indra/llui/lltabcontainer.h')
| -rw-r--r-- | indra/llui/lltabcontainer.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llui/lltabcontainer.h b/indra/llui/lltabcontainer.h index 5d0f194bf9..33c49e0d6f 100644 --- a/indra/llui/lltabcontainer.h +++ b/indra/llui/lltabcontainer.h @@ -172,6 +172,7 @@ public: BOOL getTabPanelFlashing(LLPanel* child); void setTabPanelFlashing(LLPanel* child, BOOL state); void setTabImage(LLPanel* child, std::string img_name, const LLColor4& color = LLColor4::white); + void setTabImage(LLPanel* child, const LLUUID& img_id, const LLColor4& color = LLColor4::white); void setTitle( const std::string& title ); const std::string getPanelTitle(S32 index); |