diff options
| author | Jacek Antonelli | 2009-09-23 02:29:44 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2009-09-23 02:29:44 -0500 |
| commit | cd2b97b3e6446449443700ae9a1521c402c93850 (patch) | |
| tree | 0c45e5a05cdcb6956fb859c9fef834a5c5613a04 /linden/indra/newview/llchatbar.cpp | |
| parent | Commented out Linux tarball building. (diff) | |
| parent | Display selected avatars larger than normal, zoom in at a reasonable speed. I... (diff) | |
| download | meta-impy-cd2b97b3e6446449443700ae9a1521c402c93850.zip meta-impy-cd2b97b3e6446449443700ae9a1521c402c93850.tar.gz meta-impy-cd2b97b3e6446449443700ae9a1521c402c93850.tar.bz2 meta-impy-cd2b97b3e6446449443700ae9a1521c402c93850.tar.xz | |
Merge remote branch 'mccabe/1.2.0-next' into next
Conflicts:
linden/indra/newview/llfloaterchat.cpp
linden/indra/newview/llfloatermap.cpp
linden/indra/newview/llinventorybridge.cpp
linden/indra/newview/llnetmap.cpp
linden/indra/newview/llviewermessage.cpp
linden/indra/newview/llviewerobjectlist.cpp
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/newview/llchatbar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llchatbar.cpp b/linden/indra/newview/llchatbar.cpp index 1b1284d..1de3690 100644 --- a/linden/indra/newview/llchatbar.cpp +++ b/linden/indra/newview/llchatbar.cpp | |||
| @@ -616,7 +616,7 @@ void LLChatBar::sendChatFromViewer(const LLWString &wtext, EChatType type, BOOL | |||
| 616 | { | 616 | { |
| 617 | // Look for "/20 foo" channel chats. | 617 | // Look for "/20 foo" channel chats. |
| 618 | S32 channel = mChannelControl ? (S32)(getChild<LLSpinCtrl>("channel_control")->get()) : 0; | 618 | S32 channel = mChannelControl ? (S32)(getChild<LLSpinCtrl>("channel_control")->get()) : 0; |
| 619 | //S32 channel = (S32)(getChild<LLSpinCtrl>("ChatChannel")->get()); | 619 | |
| 620 | LLWString out_text = stripChannelNumber(wtext, &channel); | 620 | LLWString out_text = stripChannelNumber(wtext, &channel); |
| 621 | std::string utf8_out_text = wstring_to_utf8str(out_text); | 621 | std::string utf8_out_text = wstring_to_utf8str(out_text); |
| 622 | std::string utf8_text = wstring_to_utf8str(wtext); | 622 | std::string utf8_text = wstring_to_utf8str(wtext); |