diff options
| author | Brad Kittenbrink <brad@lindenlab.com> | 2008-02-27 18:58:14 +0000 |
|---|---|---|
| committer | Brad Kittenbrink <brad@lindenlab.com> | 2008-02-27 18:58:14 +0000 |
| commit | 6d52efe452aa8469e0343da1c7d108f3f52ab651 (patch) | |
| tree | a87be48e9840d7fc1f7ee514d7c7f994e71fdb3c /indra/llcommon/llkeythrottle.h | |
| parent | 6027ad2630b8650cabcf00628ee9b0d25bedd67f (diff) | |
Merge of windlight into release (QAR-286). This includes all changes in
windlight14 which have passed QA (up through r79932).
svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620
Diffstat (limited to 'indra/llcommon/llkeythrottle.h')
| -rw-r--r-- | indra/llcommon/llkeythrottle.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/llcommon/llkeythrottle.h b/indra/llcommon/llkeythrottle.h index 775ecdfc99..d831eadd59 100644 --- a/indra/llcommon/llkeythrottle.h +++ b/indra/llcommon/llkeythrottle.h @@ -192,10 +192,7 @@ public: { noteAction(id); typename LLKeyThrottleImpl<T>::Entry& curr = (*m.currMap)[id]; - if (curr.count < m.countLimit) - { - curr.count = m.countLimit; - } + curr.count = llmax(m.countLimit, curr.count); curr.blocked = TRUE; } |