diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-06-09 13:53:02 -0400 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-06-09 13:53:02 -0400 |
| commit | 5ce0d30ec91a35ed1e32a957597758502a966b9c (patch) | |
| tree | 9a6c4b04b4c3d7bb3141846d69d4efd158ef228c /indra/newview/llchatbar.cpp | |
| parent | 17edcc939a49d36415d3cfdd9b8c213ebb83a537 (diff) | |
| parent | 4a8109476cfdb1505e9dc122526caacd6cdda374 (diff) | |
reconciled .hgtags
Diffstat (limited to 'indra/newview/llchatbar.cpp')
| -rw-r--r-- | indra/newview/llchatbar.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llchatbar.cpp b/indra/newview/llchatbar.cpp index 6e58be8174..cf0374075a 100644 --- a/indra/newview/llchatbar.cpp +++ b/indra/newview/llchatbar.cpp @@ -671,6 +671,9 @@ void LLChatBar::onCommitGesture(LLUICtrl* ctrl) } } + +/* Cruft - global gChatHandler declared below has been commented out, + so this class is never used. See similar code in llnearbychatbar.cpp class LLChatHandler : public LLCommandHandler { public: @@ -691,7 +694,7 @@ public: { S32 channel = tokens[0].asInteger(); // VWR-19499 Restrict function to chat channels greater than 0. - if ((channel > 0) && (channel < 2147483647)) + if ((channel > 0) && (channel < CHAT_CHANNEL_DEBUG)) { retval = true; // Say mesg on channel @@ -710,3 +713,4 @@ public: // Creating the object registers with the dispatcher. //LLChatHandler gChatHandler; +cruft */ |