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/llinventoryobserver.h | |
| parent | 5fccb539937a52d286274a002266e022e2102e5e (diff) | |
| parent | 32fcefc058ae38eff0572326ef3efd1c7b343144 (diff) | |
Merge branch 'DRTVWR-600-maint-A' into signal/trim-trailing
Diffstat (limited to 'indra/newview/llinventoryobserver.h')
| -rw-r--r-- | indra/newview/llinventoryobserver.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llinventoryobserver.h b/indra/newview/llinventoryobserver.h index 43bcf14d89..950b02d3cf 100644 --- a/indra/newview/llinventoryobserver.h +++ b/indra/newview/llinventoryobserver.h @@ -80,7 +80,7 @@ public: void setFetchID(const LLUUID& id); void setFetchIDs(const uuid_vec_t& ids); - BOOL isFinished() const; + bool isFinished() const; virtual void startFetch() = 0; virtual void changed(U32 mask) = 0; @@ -131,7 +131,7 @@ public: virtual void startFetch(); /*virtual*/ void changed(U32 mask); protected: - BOOL isCategoryComplete(const LLViewerInventoryCategory* cat) const; + bool isCategoryComplete(const LLViewerInventoryCategory* cat) const; }; //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |