summaryrefslogtreecommitdiff
path: root/indra/llcommon/llpredicate.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2012-10-26 20:03:33 -0700
committerRichard Linden <none@none>2012-10-26 20:03:33 -0700
commit3ffd0be53af0c5338e6fdc77d240e976aeb10451 (patch)
tree43746854cc79928677c1644259e48cdfd8a7251d /indra/llcommon/llpredicate.cpp
parent7f97aa2d5db0d1429136a40d04d2e4428cb184fe (diff)
SH-3405 WIP convert existing stats to lltrace system
fixed llpredicate so that values and rules work uniformly with predicate logic and/or/negate works in parallel with set/clear
Diffstat (limited to 'indra/llcommon/llpredicate.cpp')
-rw-r--r--indra/llcommon/llpredicate.cpp22
1 files changed, 8 insertions, 14 deletions
diff --git a/indra/llcommon/llpredicate.cpp b/indra/llcommon/llpredicate.cpp
index e3410ef3f6..1278948e24 100644
--- a/indra/llcommon/llpredicate.cpp
+++ b/indra/llcommon/llpredicate.cpp
@@ -29,19 +29,13 @@
namespace LLPredicate
{
- EmptyRule make_rule() { return EmptyRule(); }
-
- S32 predicateFlagsFromValue(S32 value)
+ const U32 cPredicateFlagsFromEnum[5] =
{
- llassert(value < 5);
- static const S32 predicates[5] =
- {
- 0xAAAAaaaa, // 10101010101010101010101010101010
- 0xCCCCcccc, // 11001100110011001100110011001100
- 0xF0F0F0F0, // 11110000111100001111000011110000
- 0xFF00FF00, // 11111111000000001111111100000000
- 0xFFFF0000 // 11111111111111110000000000000000
- };
- return predicates[value];
- }
+ 0xAAAAaaaa, // 10101010101010101010101010101010
+ 0xCCCCcccc, // 11001100110011001100110011001100
+ 0xF0F0F0F0, // 11110000111100001111000011110000
+ 0xFF00FF00, // 11111111000000001111111100000000
+ 0xFFFF0000 // 11111111111111110000000000000000
+ };
}
+