diff options
| author | Cho <cho@lindenlab.com> | 2013-02-11 22:43:15 +0000 |
|---|---|---|
| committer | Cho <cho@lindenlab.com> | 2013-02-11 22:43:15 +0000 |
| commit | c4bcd4f2c2578e8f165361441635ef47f51ec420 (patch) | |
| tree | 58e0aa6b0f42012595754654b1a7d32413328c5b /indra/newview/llconversationlog.h | |
| parent | a8776acbb314373b633f3c4102c1b6f12f134522 (diff) | |
| parent | f6b9d2bce45818f15e2882a7cb34ce9ea7a2e4ba (diff) | |
merging
Diffstat (limited to 'indra/newview/llconversationlog.h')
| -rw-r--r-- | indra/newview/llconversationlog.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llconversationlog.h b/indra/newview/llconversationlog.h index d5b6eccb29..fd38556131 100644 --- a/indra/newview/llconversationlog.h +++ b/indra/newview/llconversationlog.h @@ -58,7 +58,7 @@ public: const time_t& getTime() const { return mTime; } bool hasOfflineMessages() const { return mHasOfflineIMs; } - void setConverstionName(std::string conv_name) { mConversationName = conv_name; } + void setConversationName(std::string conv_name) { mConversationName = conv_name; } void setOfflineMessages(bool new_messages) { mHasOfflineIMs = new_messages; } bool isOlderThan(U32 days) const; |