diff options
| author | Kent Quirk <q@lindenlab.com> | 2009-01-05 18:59:12 +0000 |
|---|---|---|
| committer | Kent Quirk <q@lindenlab.com> | 2009-01-05 18:59:12 +0000 |
| commit | 667ca55bad0108c4bdf8f007b89e1a52fc766aad (patch) | |
| tree | 7bd62ac8d9af079c3994565f3f200ccc250bbc28 /indra/llui/lluictrl.cpp | |
| parent | 95f365789f4cebc7bd97ccefd538f14d481a8373 (diff) | |
svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk.
Diffstat (limited to 'indra/llui/lluictrl.cpp')
| -rw-r--r-- | indra/llui/lluictrl.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/indra/llui/lluictrl.cpp b/indra/llui/lluictrl.cpp index f7419d615b..6e822f7c03 100644 --- a/indra/llui/lluictrl.cpp +++ b/indra/llui/lluictrl.cpp @@ -475,10 +475,10 @@ BOOL LLUICtrl::focusPrevItem(BOOL text_fields_only) return focusPrev(result); } -LLUICtrl* LLUICtrl::findRootMostFocusRoot() const +LLUICtrl* LLUICtrl::findRootMostFocusRoot() { - const LLUICtrl* focus_root = NULL; - const LLUICtrl* next_view = this; + LLUICtrl* focus_root = NULL; + LLUICtrl* next_view = this; while(next_view) { if (next_view->isFocusRoot()) @@ -487,9 +487,8 @@ LLUICtrl* LLUICtrl::findRootMostFocusRoot() const } next_view = next_view->getParentUICtrl(); } - // since focus_root could be this, need to cast away const to return - // a non-const result - return const_cast<LLUICtrl*>(focus_root); + + return focus_root; } |