diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-10-03 19:28:18 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-10-03 19:42:47 +0300 |
| commit | 13f1273c1d0cd7af382b282bd54da2b7efcc70b3 (patch) | |
| tree | 31a0e89bd7fe86a91b0fccf3f33642af0741c7bc /indra/llui/llscrollbar.h | |
| parent | 78f5dbd95f1295af14093807ca125b92e6f5a9d3 (diff) | |
| parent | 2465470817957c8378e81ec1a7e32551fbac7b26 (diff) | |
Merge branch 'main' into DRTVWR-588-maint-W
# Conflicts:
# indra/llui/lltooltip.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llvovolume.cpp
# indra/newview/skins/default/textures/textures.xml
Diffstat (limited to 'indra/llui/llscrollbar.h')
| -rw-r--r-- | indra/llui/llscrollbar.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llscrollbar.h b/indra/llui/llscrollbar.h index 5f2f490d81..9be9d22db8 100644 --- a/indra/llui/llscrollbar.h +++ b/indra/llui/llscrollbar.h @@ -105,8 +105,8 @@ public: bool setDocPos( S32 pos, BOOL update_thumb = TRUE ); S32 getDocPos() const { return mDocPos; } - BOOL isAtBeginning(); - BOOL isAtEnd(); + bool isAtBeginning() const; + bool isAtEnd() const; // Setting both at once. void setDocParams( S32 size, S32 pos ); |