diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-06-01 07:21:09 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-06-01 07:21:09 -0400 |
| commit | e9501b855b32189f1bf627853487a443e6d9daf8 (patch) | |
| tree | 3fead613d37b33f51f99a09c8a1fd8ab4f6b3353 /indra/newview/llchatbar.cpp | |
| parent | 6c9b45f4d6776e87cb1d70df0c456d29c3eb0ed7 (diff) | |
| parent | d6f7526abf223b671b4e17be48dcc1e46e8f2fd8 (diff) | |
merge changes for storm-1299
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 */ |