diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-04-02 17:18:36 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-04-02 17:18:36 +0300 |
| commit | 7d38dd51c2a59d173bee9c04737002313f4b9dec (patch) | |
| tree | 4ba43c9a6d4c15ac6f3bd2979558498a43fbcfd1 /indra/llui/lllineeditor.h | |
| parent | f6b48339d9423399ccd1c93709de978ccc7f5a8c (diff) | |
| parent | a7085418df1ada6e19b94b6df772ed21e663d119 (diff) | |
Manual merge from default branch.
Resolved a conflict in indra/llui/llurlentry.cpp. That broke the fix for EXT-6357.
--HG--
branch : product-engine
Diffstat (limited to 'indra/llui/lllineeditor.h')
| -rw-r--r-- | indra/llui/lllineeditor.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/llui/lllineeditor.h b/indra/llui/lllineeditor.h index b62138426b..9489e723e3 100644 --- a/indra/llui/lllineeditor.h +++ b/indra/llui/lllineeditor.h @@ -81,7 +81,6 @@ public: background_image_focused; Optional<bool> select_on_focus, - handle_edit_keys_directly, revert_on_esc, commit_on_focus_lost, ignore_tab; @@ -215,7 +214,6 @@ public: void extendSelection(S32 new_cursor_pos); void deleteSelection(); - void setHandleEditKeysDirectly( BOOL b ) { mHandleEditKeysDirectly = b; } void setSelectAllonFocusReceived(BOOL b); typedef boost::function<void (LLLineEditor* caller, void* user_data)> callback_t; @@ -247,7 +245,6 @@ private: void addChar(const llwchar c); void setCursorAtLocalPos(S32 local_mouse_x); S32 findPixelNearestPos(S32 cursor_offset = 0) const; - void reportBadKeystroke(); BOOL handleSpecialKey(KEY key, MASK mask); BOOL handleSelectionKey(KEY key, MASK mask); BOOL handleControlKey(KEY key, MASK mask); @@ -325,7 +322,6 @@ protected: BOOL mIgnoreTab; BOOL mDrawAsterixes; - BOOL mHandleEditKeysDirectly; // If true, the standard edit keys (Ctrl-X, Delete, etc,) are handled here instead of routed by the menu system BOOL mSelectAllonFocusReceived; BOOL mPassDelete; |