diff options
author | Don Kjer <don@lindenlab.com> | 2007-10-11 00:28:42 +0000 |
---|---|---|
committer | Don Kjer <don@lindenlab.com> | 2007-10-11 00:28:42 +0000 |
commit | 1b550aaec246063090fe7143145d69eebfbd4680 (patch) | |
tree | 66b1d7c9f424e0183c5488037fcdae3a37916955 /indra/newview/llchatbar.cpp | |
parent | 5ec8bbbe2244ea70d8aa74b5c572351632699425 (diff) |
EFFECTIVE MERGE: svn merge -r 69928:70806 svn+ssh://svn/svn/linden/branches/maintenance-1 && svn merge -r 70948:70949 svn+ssh://svn/svn/linden/branches/maintenance-1-qa into release
ACTUAL MERGE: svn merge -r 71430:71431 svn+ssh://svn/svn/linden/qa/maintenance-1-merge-71429 into release
Diffstat (limited to 'indra/newview/llchatbar.cpp')
-rw-r--r-- | indra/newview/llchatbar.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llchatbar.cpp b/indra/newview/llchatbar.cpp index 21a5e08587..3517c1e18a 100644 --- a/indra/newview/llchatbar.cpp +++ b/indra/newview/llchatbar.cpp @@ -456,7 +456,7 @@ LLWString LLChatBar::stripChannelNumber(const LLWString &mesg, S32* channel) } else if (mesg[0] == '/' && mesg[1] - && isdigit(mesg[1])) + && LLStringOps::isDigit(mesg[1])) { // This a special "/20" speak on a channel S32 pos = 0; @@ -470,7 +470,7 @@ LLWString LLChatBar::stripChannelNumber(const LLWString &mesg, S32* channel) channel_string[pos] = c; pos++; } - while(c && pos < 64 && isdigit(c)); + while(c && pos < 64 && LLStringOps::isDigit(c)); // Move the pointer forward to the first non-whitespace char // Check isspace before looping, so we can handle "/33foo" |