diff options
| author | Jacek Antonelli | 2009-09-26 23:03:39 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2009-09-26 23:03:59 -0500 |
| commit | 5d5e6d47d1ca47daefa8342ad060529ca0b64787 (patch) | |
| tree | 1b0152d6d73abe4471dfaee99d226bf4be8e4205 /linden/indra/newview/llfloaterchat.cpp | |
| parent | Removed the multiple accounts tip from grid manager. (diff) | |
| parent | Merge remote branch 'mccabe/1.2.0-next' into next (diff) | |
| download | meta-impy-5d5e6d47d1ca47daefa8342ad060529ca0b64787.zip meta-impy-5d5e6d47d1ca47daefa8342ad060529ca0b64787.tar.gz meta-impy-5d5e6d47d1ca47daefa8342ad060529ca0b64787.tar.bz2 meta-impy-5d5e6d47d1ca47daefa8342ad060529ca0b64787.tar.xz | |
Merge branch 'gridmanager' into next
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/newview/llfloaterchat.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/linden/indra/newview/llfloaterchat.cpp b/linden/indra/newview/llfloaterchat.cpp index 1f51a21..1f34ad0 100644 --- a/linden/indra/newview/llfloaterchat.cpp +++ b/linden/indra/newview/llfloaterchat.cpp | |||
| @@ -108,6 +108,8 @@ LLFloaterChat::LLFloaterChat(const LLSD& seed) | |||
| 108 | childSetVisible("Chat History Editor with mute",FALSE); | 108 | childSetVisible("Chat History Editor with mute",FALSE); |
| 109 | childSetAction("toggle_active_speakers_btn", onClickToggleActiveSpeakers, this); | 109 | childSetAction("toggle_active_speakers_btn", onClickToggleActiveSpeakers, this); |
| 110 | setDefaultBtn("Chat"); | 110 | setDefaultBtn("Chat"); |
| 111 | |||
| 112 | //toggleHistoryChannelControl(); temporarily disable until working | ||
| 111 | } | 113 | } |
| 112 | 114 | ||
| 113 | LLFloaterChat::~LLFloaterChat() | 115 | LLFloaterChat::~LLFloaterChat() |