diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-09-04 13:35:38 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-09-04 13:35:38 -0700 |
| commit | 5c14f6e783c2581d0e4401d82581e7a5def99043 (patch) | |
| tree | 579fe240496416f3c09ed7b9e29d1e06b0b2a570 /indra/newview/llconversationloglistitem.h | |
| parent | 5fbb161ba0a28e64474efc295b12bccffdcdb0e0 (diff) | |
| parent | 7bad109c3d7e6d70649839634586a09033cfb207 (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; |