diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-12-12 10:40:47 -0800 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-12-12 10:40:47 -0800 |
| commit | e7a912816eef5befcfce4eeeeece5da82c763fae (patch) | |
| tree | 03c5ba2672af69f66afa7f040d870c7590ed4b50 /indra/newview/llfloaterimcontainer.h | |
| parent | b4e738e5034cde1699a7a3cbe51b84c3294eedd0 (diff) | |
| parent | 3d7aaaada853d950888a2fd0fe3e2f375bd5bbb0 (diff) | |
mergining in latest changes
Diffstat (limited to 'indra/newview/llfloaterimcontainer.h')
| -rw-r--r-- | indra/newview/llfloaterimcontainer.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llfloaterimcontainer.h b/indra/newview/llfloaterimcontainer.h index 3818645037..4f1bb96d9b 100644 --- a/indra/newview/llfloaterimcontainer.h +++ b/indra/newview/llfloaterimcontainer.h @@ -176,6 +176,7 @@ public: void updateSpeakBtnState(); static bool isConversationLoggingAllowed(); void flashConversationItemWidget(const LLUUID& session_id, bool is_flashes); + boost::signals2::connection mMicroChangedSignal; private: LLConversationViewSession* createConversationItemWidget(LLConversationItem* item); |