Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'lirusaito/master'

Browse Source
This commit is contained in:
Latif Khalifa
2013-04-05 23:11:30 +02:00
parent 987ab9c07f da55a4a51c
commit 5ad2e32712
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/llfloaterchat.cpp
View File

@@ -179,13 +179,18 @@ void LLFloaterChat::handleVisibilityChange(BOOL new_visibility)
if (new_visibility) if (new_visibility)
{ {
LLFloaterChatterBox::getInstance()->setFloaterFlashing(this, FALSE); LLFloaterChatterBox::getInstance()->setFloaterFlashing(this, FALSE);
// Work around the chat bar no longer focusing from within the layout_stack
gFocusMgr.setKeyboardFocus(getChildView("Chat Editor"));
} }
LLFloater::handleVisibilityChange(new_visibility); LLFloater::handleVisibilityChange(new_visibility);
} }
// virtual
void LLFloaterChat::onFocusReceived()
{
gFocusMgr.setKeyboardFocus(getChildView("Chat Editor")); // Work around the chat bar no longer focusing from within the layout_stack
LLFloater::onFocusReceived();
}
void LLFloaterChat::setMinimized(BOOL minimized) void LLFloaterChat::setMinimized(BOOL minimized)
{ {
LLFloater::setMinimized(minimized); LLFloater::setMinimized(minimized);

1
indra/newview/llfloaterchat.h
View File

@@ -63,6 +63,7 @@ public:
virtual void draw(); virtual void draw();
virtual BOOL postBuild(); virtual BOOL postBuild();
virtual void onClose(bool app_quitting); virtual void onClose(bool app_quitting);
virtual void onFocusReceived();
virtual void handleVisibilityChange(BOOL cur_visibility); virtual void handleVisibilityChange(BOOL cur_visibility);
virtual void setMinimized(BOOL); virtual void setMinimized(BOOL);
void updateConsoleVisibility(); void updateConsoleVisibility();