diff options
| author | Richard Nelson <richard@lindenlab.com> | 2011-10-10 14:24:08 -0700 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2011-10-10 14:24:08 -0700 |
| commit | 6a61e4faa4b937ddc9ab5feb79c139395a2c8799 (patch) | |
| tree | 850707278272f11cfc9ac5c4b01a0d48a3071e5a /indra/llui/tests/llurlentry_test.cpp | |
| parent | ec5ea33c8113a63e956c195ccf051b2a03979be9 (diff) | |
| parent | e61569d71422931e0d1f8d7e2f6e4db13d8b03ba (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
Diffstat (limited to 'indra/llui/tests/llurlentry_test.cpp')
| -rw-r--r-- | indra/llui/tests/llurlentry_test.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/llui/tests/llurlentry_test.cpp b/indra/llui/tests/llurlentry_test.cpp index 2f814f4200..c1fb050206 100644 --- a/indra/llui/tests/llurlentry_test.cpp +++ b/indra/llui/tests/llurlentry_test.cpp @@ -72,7 +72,6 @@ S32 LLUIImage::getHeight() const namespace LLInitParam { - S32 Parser::sNextParseGeneration = 0; BlockDescriptor::BlockDescriptor() {} ParamDescriptor::ParamDescriptor(param_handle_t p, merge_func_t merge_func, |