diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-06-10 20:03:54 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-10 20:03:54 +0300 |
| commit | f74c10c4ec6435471bac84473fe865f90843c2df (patch) | |
| tree | b2853d87789dbb84d6c26c259eab6639d3a7e482 /indra/newview/lltoolmgr.h | |
| parent | 5fccb539937a52d286274a002266e022e2102e5e (diff) | |
| parent | 32fcefc058ae38eff0572326ef3efd1c7b343144 (diff) | |
Merge branch 'DRTVWR-600-maint-A' into signal/trim-trailing
Diffstat (limited to 'indra/newview/lltoolmgr.h')
| -rw-r--r-- | indra/newview/lltoolmgr.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lltoolmgr.h b/indra/newview/lltoolmgr.h index fd7d063740..6cfdbaac06 100644 --- a/indra/newview/lltoolmgr.h +++ b/indra/newview/lltoolmgr.h @@ -64,7 +64,7 @@ public: void setTransientTool(LLTool* tool); void clearTransientTool(); - BOOL usingTransientTool(); + bool usingTransientTool(); void setCurrentToolset(LLToolset* current); LLToolset* getCurrentToolset(); @@ -106,7 +106,7 @@ public: void handleScrollWheel(S32 clicks); - BOOL isToolSelected( S32 index ); + bool isToolSelected( S32 index ); void setShowFloaterTools(bool pShowFloaterTools) {mIsShowFloaterTools = pShowFloaterTools;}; bool isShowFloaterTools() const {return mIsShowFloaterTools;}; |