summaryrefslogtreecommitdiff
path: root/indra/newview/llconversationview.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-03-05 17:51:10 -0500
committerOz Linden <oz@lindenlab.com>2013-03-05 17:51:10 -0500
commitd348deb7049cbaef7c228000525c7ee5a265464c (patch)
tree810010b25bc5f0ba4511b40752f5f9ca7cb59b06 /indra/newview/llconversationview.h
parentf7100331ebc7913d7117501ccac86f93f4ffb0e3 (diff)
parent55b2383f51ffabf7e95595df5d576f383d458ee1 (diff)
merge changes for 3.5.0-beta2
Diffstat (limited to 'indra/newview/llconversationview.h')
-rwxr-xr-xindra/newview/llconversationview.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llconversationview.h b/indra/newview/llconversationview.h
index f9b45073f4..76d3d079ea 100755
--- a/indra/newview/llconversationview.h
+++ b/indra/newview/llconversationview.h
@@ -130,7 +130,6 @@ public:
virtual ~LLConversationViewParticipant( void );
bool hasSameValue(const LLUUID& uuid) { return (uuid == mUUID); }
- virtual void refresh();
void addToFolder(LLFolderViewFolder* folder);
void addToSession(const LLUUID& session_id);