diff options
| author | Richard Linden <none@none> | 2013-06-05 19:05:43 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-06-05 19:05:43 -0700 |
| commit | 0a96b47663c99914c587cdcb8bcdc096bbf55fa3 (patch) | |
| tree | 67bca4958927ed7f6df423de05e42cd271292391 /indra/llui/llscrollcontainer.cpp | |
| parent | dcfb18373eca7986a73d8b9a1d34970cc0a23ed9 (diff) | |
| parent | a74b5dfa923f8eeccc9b786143f0f832de3ad450 (diff) | |
merge with viewer-release
Diffstat (limited to 'indra/llui/llscrollcontainer.cpp')
| -rwxr-xr-x | 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 cbcce0ece5..3b5fb2adfb 100755 --- a/indra/llui/llscrollcontainer.cpp +++ b/indra/llui/llscrollcontainer.cpp @@ -144,7 +144,7 @@ LLScrollContainer::~LLScrollContainer( void ) { // mScrolledView and mScrollbar are child views, so the LLView // destructor takes care of memory deallocation. - for( S32 i = 0; i < SCROLLBAR_COUNT; i++ ) + for( S32 i = 0; i < ORIENTATION_COUNT; i++ ) { mScrollbar[i] = NULL; } @@ -215,7 +215,7 @@ BOOL LLScrollContainer::handleKeyHere(KEY key, MASK mask) { return TRUE; } - for( S32 i = 0; i < SCROLLBAR_COUNT; i++ ) + for( S32 i = 0; i < ORIENTATION_COUNT; i++ ) { if( mScrollbar[i]->handleKeyHere(key, mask) ) { |