summaryrefslogtreecommitdiff
path: root/indra/newview/llconversationmodel.h
diff options
context:
space:
mode:
authorCallum Prentice <callum@lindenlab.com>2014-08-04 16:37:17 -0700
committerCallum Prentice <callum@lindenlab.com>2014-08-04 16:37:17 -0700
commit77751a15d1dc976d77d41db5b586e18b5311ccb4 (patch)
tree44e5eb4fe3664ba42ba91f3feb30d57e058e1c7b /indra/newview/llconversationmodel.h
parentc25105945a9d74e331cae4d827fc3be8d8915b7a (diff)
parent1346949e4d601e8c945fa30593ba1d405e9ed80d (diff)
Merge with head of viewer-release
Diffstat (limited to 'indra/newview/llconversationmodel.h')
-rw-r--r--indra/newview/llconversationmodel.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llconversationmodel.h b/indra/newview/llconversationmodel.h
index dc74506c53..56e1a26709 100644
--- a/indra/newview/llconversationmodel.h
+++ b/indra/newview/llconversationmodel.h
@@ -143,6 +143,7 @@ protected:
bool mNeedsRefresh; // Flag signaling to the view that something changed for this item
F64 mLastActiveTime;
bool mDisplayModeratorOptions;
+ bool mDisplayGroupBanOptions;
boost::signals2::connection mAvatarNameCacheConnection;
};
@@ -206,6 +207,7 @@ public:
void dumpDebugData();
void setModeratorOptionsVisible(bool visible) { mDisplayModeratorOptions = visible; }
void setDisplayModeratorRole(bool displayRole);
+ void setGroupBanVisible(bool visible) { mDisplayGroupBanOptions = visible; }
private:
void onAvatarNameCache(const LLAvatarName& av_name); // callback used by fetchAvatarName