diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-07 15:27:17 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-07 15:27:17 +0000 |
| commit | 0775e919018a8246e7af03f00b94f50abd84dd96 (patch) | |
| tree | 530fcb0473adacde42f9c3df2258f1c26a6bcc62 /indra/llui/llcombobox.h | |
| parent | 93051dc23cb3252af327a9b113abc45de154ff4e (diff) | |
| parent | f499260782a0c94c4f164a743da9d2690240dad7 (diff) | |
PE merge.
Diffstat (limited to 'indra/llui/llcombobox.h')
| -rw-r--r-- | indra/llui/llcombobox.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/llcombobox.h b/indra/llui/llcombobox.h index c694724248..965061ead2 100644 --- a/indra/llui/llcombobox.h +++ b/indra/llui/llcombobox.h @@ -150,7 +150,7 @@ public: // Get name of current item. Returns an empty string if not found. const std::string getSimple() const; // Get contents of column x of selected row - const std::string getSelectedItemLabel(S32 column = 0) const; + virtual const std::string getSelectedItemLabel(S32 column = 0) const; // Sets the label, which doesn't have to exist in the label. // This is probably a UI abuse. @@ -248,6 +248,7 @@ public: }; /*virtual*/ void setValue(const LLSD& value); + /*virtual*/ const std::string getSelectedItemLabel(S32 column = 0) const; private: enum EColumnIndex |