diff options
author | Dave Houlton <euclid@lindenlab.com> | 2020-09-22 22:22:21 +0000 |
---|---|---|
committer | Dave Houlton <euclid@lindenlab.com> | 2020-09-22 22:22:21 +0000 |
commit | 364ba9978b42ca03c39ee63c23fc1378e410ca96 (patch) | |
tree | a5ebd2bd8a4d6e87f55d1be6f278b1807b53de0f /indra/llui/llcombobox.h | |
parent | b62d7c2f06fdaa91312fd6857d03748defe8b60f (diff) | |
parent | 86e7cc3d35e41a88b25175bafb5687e1864423d9 (diff) |
Merged in DV497-merge-6.4.9 (pull request #312)
Merge 6.4.9 into DRTVWR-497
Diffstat (limited to 'indra/llui/llcombobox.h')
-rw-r--r-- | indra/llui/llcombobox.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llui/llcombobox.h b/indra/llui/llcombobox.h index 7d38c051a5..4af3313162 100644 --- a/indra/llui/llcombobox.h +++ b/indra/llui/llcombobox.h @@ -158,6 +158,8 @@ public: BOOL setCurrentByIndex( S32 index ); S32 getCurrentIndex() const; + void setEnabledByValue(const LLSD& value, BOOL enabled); + void createLineEditor(const Params&); //======================================================================== |