diff options
| author | dolphin <dolphin@lindenlab.com> | 2013-10-25 09:52:31 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2013-10-25 09:52:31 -0700 |
| commit | 7bbb802385e58b1f9c2e7b04ad2f3f20c125be44 (patch) | |
| tree | 88ccb7d4cc17bb9615ee61ef001f8cb8963252fb /indra/llui/llchatentry.h | |
| parent | a6faeac94530e59d2c2a56df63a1d78e00fb0247 (diff) | |
| parent | ea1e1b0925b386cf83178539b8eae9e25c573548 (diff) | |
Merge with 3.6.9
Diffstat (limited to 'indra/llui/llchatentry.h')
| -rwxr-xr-x | indra/llui/llchatentry.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llchatentry.h b/indra/llui/llchatentry.h index e67f39b21b..3f13691a30 100755 --- a/indra/llui/llchatentry.h +++ b/indra/llui/llchatentry.h @@ -62,8 +62,8 @@ public: virtual void draw(); virtual void onCommit(); - /*virtual*/ void onFocusReceived(); - /*virtual*/ void onFocusLost(); + /*virtual*/ void onFocusReceived(); + /*virtual*/ void onFocusLost(); void enableSingleLineMode(bool single_line_mode); boost::signals2::connection setTextExpandedCallback(const commit_signal_t::slot_type& cb); |