diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-08-14 01:15:46 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-08-14 01:15:46 +0000 |
| commit | 1db494f58ad378b8028c1f071196be82af5fe964 (patch) | |
| tree | fd9cb0ab556ce32aaeca8e524f26cb46f60794e4 /indra/llui/llscrollcontainer.cpp | |
| parent | 61ae45fb80f5bccf0481659a4b16094f6c46047e (diff) | |
* Added a few safety checks to LLScrollContainer
* Minor change to LLIMView so that IM windows don't get hidden after they are displayed
* Changed default action for avatar list to be IM as per spec
* Fixed merge of home tab from avatar code.
Diffstat (limited to 'indra/llui/llscrollcontainer.cpp')
| -rw-r--r-- | indra/llui/llscrollcontainer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llscrollcontainer.cpp b/indra/llui/llscrollcontainer.cpp index 402c050d2e..6f1572eda5 100644 --- a/indra/llui/llscrollcontainer.cpp +++ b/indra/llui/llscrollcontainer.cpp @@ -202,7 +202,7 @@ BOOL LLScrollContainer::handleKeyHere(KEY key, MASK mask) // NOTE: this should not recurse indefinitely as handleKeyHere // should not propagate to parent controls, so mScrolledView should *not* // call LLScrollContainer::handleKeyHere in turn - if (mScrolledView->handleKeyHere(key, mask)) + if (mScrolledView && mScrolledView->handleKeyHere(key, mask)) { return TRUE; } @@ -335,7 +335,7 @@ BOOL LLScrollContainer::handleDragAndDrop(S32 x, S32 y, MASK mask, void LLScrollContainer::calcVisibleSize( S32 *visible_width, S32 *visible_height, BOOL* show_h_scrollbar, BOOL* show_v_scrollbar ) const { - const LLRect& rect = mScrolledView->getRect(); + const LLRect& rect = getScrolledViewRect(); calcVisibleSize(rect, visible_width, visible_height, show_h_scrollbar, show_v_scrollbar); } |