diff options
author | Aimee Linden <aimee@lindenlab.com> | 2010-02-11 14:53:11 +0000 |
---|---|---|
committer | Aimee Linden <aimee@lindenlab.com> | 2010-02-11 14:53:11 +0000 |
commit | d7e8a30a5a9bd416254f83e20054c73edf3f890d (patch) | |
tree | 43a156ca397913ce7da626ac9c002e1036f2460c /indra/llui/lltexteditor.h | |
parent | 898e9da1af113704e2e10328dfa5396deb24eb30 (diff) | |
parent | 1b8a7fdeaab78216baad1f916e9788c0b90287b3 (diff) |
merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
Diffstat (limited to 'indra/llui/lltexteditor.h')
-rw-r--r-- | indra/llui/lltexteditor.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/lltexteditor.h b/indra/llui/lltexteditor.h index 00c6a8b68a..71d937b2c4 100644 --- a/indra/llui/lltexteditor.h +++ b/indra/llui/lltexteditor.h @@ -204,7 +204,7 @@ public: void getSelectedSegments(segment_vec_t& segments) const; void setShowContextMenu(bool show) { mShowContextMenu = show; } - bool getChowContextMenu() const { return mShowContextMenu; } + bool getShowContextMenu() const { return mShowContextMenu; } protected: void showContextMenu(S32 x, S32 y); |