diff options
author | mberezhnoy <mberezhnoy@productengine.com> | 2013-01-30 21:30:20 +0200 |
---|---|---|
committer | mberezhnoy <mberezhnoy@productengine.com> | 2013-01-30 21:30:20 +0200 |
commit | 84148762d974e728dbcb33f16aa641054ab0b641 (patch) | |
tree | d8a4477ea987de4eada4aca30a4ef4639e7ae077 /indra/newview/llfloaterconversationlog.h | |
parent | b96f04a1bb0577d42059246d15c244702ff02f88 (diff) | |
parent | 6af899f19e246c7fe4faa1edcdfbcfe9f01dbd25 (diff) |
merging
Diffstat (limited to 'indra/newview/llfloaterconversationlog.h')
-rw-r--r-- | indra/newview/llfloaterconversationlog.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterconversationlog.h b/indra/newview/llfloaterconversationlog.h index 9e79cbd7d8..aa0f480aae 100644 --- a/indra/newview/llfloaterconversationlog.h +++ b/indra/newview/llfloaterconversationlog.h @@ -49,7 +49,7 @@ private: bool isActionEnabled(const LLSD& userdata); bool isActionChecked(const LLSD& userdata); - void onCallLoggingEnabledDisabled(bool enabled); + void onCallLoggingEnabledDisabled(S32 log_mode); LLConversationLogList* mConversationLogList; }; |