summaryrefslogtreecommitdiff
path: root/indra/llui/llchatentry.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-08-27 10:37:02 -0400
committerOz Linden <oz@lindenlab.com>2013-08-27 10:37:02 -0400
commita359d9d80c013b7c6cd594bb8d94b8950fdcdf55 (patch)
tree7b687542962149ec448d436dbe62fe8ebac25d63 /indra/llui/llchatentry.h
parentf46e07c14c11ffd26c0cf0794992d7c08d16fcd4 (diff)
parent6e1138585bf745f73f0bb99ca62f77eeb273f1e4 (diff)
merge changes for 3.6.4-release
Diffstat (limited to 'indra/llui/llchatentry.h')
-rwxr-xr-xindra/llui/llchatentry.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llui/llchatentry.h b/indra/llui/llchatentry.h
index 49c8d21450..e67f39b21b 100755
--- a/indra/llui/llchatentry.h
+++ b/indra/llui/llchatentry.h
@@ -56,14 +56,14 @@ protected:
LLChatEntry(const Params& p);
/*virtual*/ void beforeValueChange();
/*virtual*/ void onValueChange(S32 start, S32 end);
- /*virtual*/ bool useLabel();
+ /*virtual*/ bool useLabel() const;
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);