diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-08-11 06:37:35 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-08-11 06:37:35 +0000 |
| commit | caa367e5d435a70647c56460741a52b14f41ec9e (patch) | |
| tree | b82b02000ede0bb1784ee17a018132bd2308d88a /indra/llui/llfocusmgr.h | |
| parent | 0984822b3ebd85e84b3c017c082d859134801ecd (diff) | |
svn merge -r 129543-130091 skinning-19 -> viewer-2.0.0-3
EXT-172 - adding non-unicode support for group name line_editor
EXT-310 text was squished, moved things around so there was was more space between text blocks.
EXT-313 "me" panel
EXT-314 changed out arrow character for arrow art, added arrow art to textures.xml
EXT-315 replaced word "mute" with "block"
EXT-322 moved Use Chat Bubbles text box from _chat.xml to _advanced.xml
EXT-323 killed some two items
EXT-324 and EXT-322 removed small avatar names checkbox and added show chat bubbled checkbox
EXT-330 Sidetray filter - text overlaps search icon inside textbox
EXT-261 I18N: Labels in /character/avatar_lad.xml are not localizable
EXT-392 Rearranged floater_inventory_items_properties.xml to match spec
DEV-35897 Filters in sidebar remain active even after user has changed/closed tab
DEV-36886 I18N: hardcoded currency format in panel_status_bar.xml/status/buycurrency
DEV-36987 - Pressed states needed for widgets
DEV-36795 Remove slurl tooltip from navigation bar location box
DEV-37184 Move "Block List" out of topmenu and make a button in Prefs > Privacy
Diffstat (limited to 'indra/llui/llfocusmgr.h')
| -rw-r--r-- | indra/llui/llfocusmgr.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/llui/llfocusmgr.h b/indra/llui/llfocusmgr.h index 165a114f3d..fbe0d22084 100644 --- a/indra/llui/llfocusmgr.h +++ b/indra/llui/llfocusmgr.h @@ -63,7 +63,6 @@ public: BOOL getKeystrokesOnly() { return mKeystrokesOnly; } void setKeystrokesOnly(BOOL keystrokes_only) { mKeystrokesOnly = keystrokes_only; } - F32 getFocusTime() const { return mFocusTimer.getElapsedTimeF32(); } F32 getFocusFlashAmt() const; S32 getFocusFlashWidth() const { return llround(lerp(1.f, 3.f, getFocusFlashAmt())); } LLColor4 getFocusColor() const; @@ -110,8 +109,7 @@ private: // Top View LLUICtrl* mTopCtrl; - LLFrameTimer mFocusTimer; - F32 mFocusWeight; + LLFrameTimer mFocusFlashTimer; BOOL mAppHasFocus; |