diff options
| author | Gilbert Gonzales <username@lindenlab.com> | 2012-08-31 11:48:03 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <username@lindenlab.com> | 2012-08-31 11:48:03 -0700 |
| commit | 383f370884e052074932f954477dec10289c64f3 (patch) | |
| tree | cd9a1dad2e5c69ace2a2582eba150f6a0e40b071 /indra/newview/llconversationloglistitem.h | |
| parent | 461550a8ff492dadd026d68949ef732d447bf592 (diff) | |
| parent | 73769180f363556d5517e3070fc4a2ac61e713d6 (diff) | |
merging in latest changes
Diffstat (limited to 'indra/newview/llconversationloglistitem.h')
| -rw-r--r-- | indra/newview/llconversationloglistitem.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llconversationloglistitem.h b/indra/newview/llconversationloglistitem.h index 8943e11604..2aaafa0fba 100644 --- a/indra/newview/llconversationloglistitem.h +++ b/indra/newview/llconversationloglistitem.h @@ -64,10 +64,10 @@ public: void onDoubleClick(); -private: - void initIcons(); +private: + const LLConversation* mConversation; LLTextBox* mConversationName; |