summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelgroup.h
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2024-09-05 08:40:49 -0400
committerNat Goodspeed <nat@lindenlab.com>2024-09-05 08:40:49 -0400
commit22a47eee84dbaa5c731c000c6013ca558bd15892 (patch)
tree8b3128fdb91731d95025b86701431826c441c5ba /indra/newview/llpanelgroup.h
parenta6b85244a6f943a4598ff9b7b8a3343eb1e0d11e (diff)
parent7ac4c3b56e5246fceaa73e7c9c665d3c04827d6c (diff)
Merge branch 'release/luau-scripting' into lua-resultset
Diffstat (limited to 'indra/newview/llpanelgroup.h')
-rw-r--r--indra/newview/llpanelgroup.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/indra/newview/llpanelgroup.h b/indra/newview/llpanelgroup.h
index d329a9561f..ede8118720 100644
--- a/indra/newview/llpanelgroup.h
+++ b/indra/newview/llpanelgroup.h
@@ -49,7 +49,7 @@ public:
LLPanelGroup();
virtual ~LLPanelGroup();
- virtual BOOL postBuild();
+ virtual bool postBuild();
void setGroupID(const LLUUID& group_id);
@@ -62,7 +62,7 @@ public:
// Implements LLVoiceClientStatusObserver::onChange() to enable the call
// button when voice is available
- /*virtual*/ void onChange(EStatusType status, const std::string &channelURI, bool proximal);
+ /*virtual*/ void onChange(EStatusType status, const LLSD& channelInfo, bool proximal);
void showNotice(const std::string& subject,
const std::string& message,
@@ -77,7 +77,7 @@ public:
void callGroup();
void chatGroup();
- virtual void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
+ virtual void reshape(S32 width, S32 height, bool called_from_parent = true);
static void showNotice(const std::string& subject,
const std::string& message,
@@ -107,7 +107,7 @@ protected:
LLTimer mRefreshTimer;
- BOOL mSkipRefresh;
+ bool mSkipRefresh;
std::string mDefaultNeedsApplyMesg;
std::string mWantApplyMesg;
@@ -135,7 +135,7 @@ public:
virtual bool needsApply(std::string& mesg) { return false; }
// Asks if there is currently a modal dialog being shown.
- virtual BOOL hasModal() { return mHasModal; }
+ virtual bool hasModal() { return mHasModal; }
// Request to apply current data.
// If returning fail, this function should modify the message to the user.
@@ -148,9 +148,9 @@ public:
virtual void update(LLGroupChange gc) { }
// This just connects the help button callback.
- virtual BOOL postBuild();
+ virtual bool postBuild();
- virtual BOOL isVisibleByAgent(LLAgent* agentp);
+ virtual bool isVisibleByAgent(LLAgent* agentp);
virtual void setGroupID(const LLUUID& id) {mGroupID = id;};
@@ -164,8 +164,8 @@ public:
protected:
LLUUID mGroupID;
- BOOL mAllowEdit;
- BOOL mHasModal;
+ bool mAllowEdit;
+ bool mHasModal;
};
#endif // LL_LLPANELGROUP_H