diff options
| author | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-02-10 14:42:30 +0200 |
|---|---|---|
| committer | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-02-10 14:42:30 +0200 |
| commit | 5831cb1394338cdfc45e3188a034edb54c2b785f (patch) | |
| tree | 56461e1f2d0a44c872d994d41342166aac1e23d0 /indra/llui | |
| parent | 3e9e874ab467dd33ff9ea542ac0834e9fe40377d (diff) | |
| parent | ea9185e0dcfde046232cc2ce20d34171b96e37e5 (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/lltexteditor.cpp | 2 | ||||
| -rw-r--r-- | indra/llui/lltexteditor.h | 2 | ||||
| -rw-r--r-- | indra/llui/lluicolortable.cpp | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp index ad9f066539..ce5f1bd082 100644 --- a/indra/llui/lltexteditor.cpp +++ b/indra/llui/lltexteditor.cpp @@ -737,7 +737,7 @@ BOOL LLTextEditor::handleRightMouseDown(S32 x, S32 y, MASK mask) } if (!LLTextBase::handleRightMouseDown(x, y, mask)) { - if(getChowContextMenu()) + if(getShowContextMenu()) { showContextMenu(x, y); } 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); diff --git a/indra/llui/lluicolortable.cpp b/indra/llui/lluicolortable.cpp index ac765fc9d5..1b64ef3abe 100644 --- a/indra/llui/lluicolortable.cpp +++ b/indra/llui/lluicolortable.cpp @@ -329,4 +329,5 @@ void LLUIColorTable::insertFromParams(const Params& p) insertFromParams(p, mUserSetColors); } -// EOF
\ No newline at end of file +// EOF + |