diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-05-02 16:41:16 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-05-02 16:41:16 -0700 |
| commit | 933cff41a6b03f2b11403970866db9fbbcf7e85f (patch) | |
| tree | 2cf5ab1f40d8cbc9b380b8ffc45ae248ef1bb45c /indra/llui/llfocusmgr.cpp | |
| parent | 90cf755eaf29a9d1122b91809065d5e8979e2810 (diff) | |
ACME-307 Fix crash when clicking profile button: The crash was caused by existing code which was taking the last focused element and assuming it was a pointer to a LLUICtrl. Now assume the pointer is of type LLView since there is not need to have it as a LLUICtrl pointer.
Diffstat (limited to 'indra/llui/llfocusmgr.cpp')
| -rw-r--r-- | 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 100644 --- 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; |