diff options
| author | simon <none@none> | 2013-10-24 16:45:38 -0700 |
|---|---|---|
| committer | simon <none@none> | 2013-10-24 16:45:38 -0700 |
| commit | 26de32910f99e2522b8e10cf41415b1af2586d5b (patch) | |
| tree | 57394ecbec4b9d7bc802e0a68c790f00f2b97887 /indra/llui/llfocusmgr.cpp | |
| parent | 93b3f1297ea5377257d14c5214790607e0b1af96 (diff) | |
| parent | ea1e1b0925b386cf83178539b8eae9e25c573548 (diff) | |
Pull in viewer-release with fbc / snowstorm
Diffstat (limited to 'indra/llui/llfocusmgr.cpp')
| -rwxr-xr-x | indra/llui/llfocusmgr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llfocusmgr.cpp b/indra/llui/llfocusmgr.cpp index 724d190307..f03c8d444b 100755 --- a/indra/llui/llfocusmgr.cpp +++ b/indra/llui/llfocusmgr.cpp @@ -469,7 +469,7 @@ void LLFocusMgr::setAppHasFocus(BOOL focus) mAppHasFocus = focus; } -LLUICtrl* LLFocusMgr::getLastFocusForGroup(LLView* subtree_root) const +LLView* LLFocusMgr::getLastFocusForGroup(LLView* subtree_root) const { if (subtree_root) { @@ -477,7 +477,7 @@ LLUICtrl* LLFocusMgr::getLastFocusForGroup(LLView* subtree_root) const if (found_it != mImpl->mFocusHistory.end()) { // found last focus for this subtree - return static_cast<LLUICtrl*>(found_it->second.get()); + return found_it->second.get(); } } return NULL; |