diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-09-13 19:17:18 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-09-13 19:17:18 -0700 |
| commit | 9d73cac97eea835740ada2aac95ea79afabff34a (patch) | |
| tree | 8a4977b795a9efa0d56c9c1c96a3e3f2c9ab73e2 /indra/newview/llconversationmodel.h | |
| parent | c6863d18d7c981756c57bbcd52baa06af00d1551 (diff) | |
| parent | 386c50d414e6357975cb18814b6bfb048b46b3da (diff) | |
merging in latest changes
Diffstat (limited to 'indra/newview/llconversationmodel.h')
| -rwxr-xr-x | indra/newview/llconversationmodel.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llconversationmodel.h b/indra/newview/llconversationmodel.h index e1713f9db7..c340194dd3 100755 --- a/indra/newview/llconversationmodel.h +++ b/indra/newview/llconversationmodel.h @@ -104,7 +104,7 @@ public: // bool hasSameValues(std::string name, const LLUUID& uuid) { return ((name == mName) && (uuid == mUUID)); } bool hasSameValue(const LLUUID& uuid) { return (uuid == mUUID); } - + void resetRefresh() { mNeedsRefresh = false; } bool needsRefresh() { return mNeedsRefresh; } @@ -121,6 +121,7 @@ public: LLConversationItemSession(const LLUUID& uuid, LLFolderViewModelInterface& root_view_model); virtual ~LLConversationItemSession() {} + /*virtual*/ bool hasChildren() const; LLPointer<LLUIImage> getIcon() const { return NULL; } void setSessionID(const LLUUID& session_id) { mUUID = session_id; mNeedsRefresh = true; } void addParticipant(LLConversationItemParticipant* participant); @@ -153,7 +154,7 @@ public: void setIsModerator(bool is_moderator) { mIsModerator = is_moderator; mNeedsRefresh = true; } void onAvatarNameCache(const LLAvatarName& av_name); - + void dumpDebugData(); private: |