diff options
| author | Don Kjer <don@lindenlab.com> | 2007-07-26 01:22:23 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2007-07-26 01:22:23 +0000 |
| commit | 9746cf5310871f305a1419163c5adfbed3f1534b (patch) | |
| tree | d1f1d278927683fe837173318cc0da1e3c2f8ca4 /indra/newview/llviewerwindow.h | |
| parent | 4284da17878eb9f8ade673d172148d34887aa816 (diff) | |
EFFECTIVE MERGE: svn merge -r 65485:66133 svn+ssh://svn/svn/linden/branches/maintenance into release
This includes fixes to the maintenance-r66133 branch, and sync'ing up with release@r66392
ACTUAL MERGE: svn merge -r 66394:66435 svn+ssh://svn/svn/linden/branches/release-r66392 into release
EQUIVALENT TO: svn merge -r 65485:66434 svn+ssh://svn/svn/linden/branches/maintenance-r66133 into release (plus branch sync'ing)
Diffstat (limited to 'indra/newview/llviewerwindow.h')
| -rw-r--r-- | indra/newview/llviewerwindow.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llviewerwindow.h b/indra/newview/llviewerwindow.h index af5ffd7914..91bf0d9918 100644 --- a/indra/newview/llviewerwindow.h +++ b/indra/newview/llviewerwindow.h @@ -154,6 +154,9 @@ public: BOOL handleKey(KEY key, MASK mask); void handleScrollWheel (S32 clicks); + // Hide normal UI when a logon fails, re-show everything when logon is attempted again + void setNormalControlsVisible( BOOL visible ); + // Handle the application becoming active (frontmost) or inactive //BOOL handleActivate(BOOL activate); |