diff options
| author | callum <none@none> | 2011-10-10 17:32:48 -0700 |
|---|---|---|
| committer | callum <none@none> | 2011-10-10 17:32:48 -0700 |
| commit | 6ad54f22f6ba0fe9f63823d57fd7c15d34e183aa (patch) | |
| tree | 5e9baa11f8aa23c527d1e47a6f4d4a75cd8799d6 /indra/llui/tests/llurlentry_test.cpp | |
| parent | 213985ca0d045252ad49d9d45f77d0727fa9008f (diff) | |
| parent | 5b1301ea8a0e50f2d15700a7e93be7628f6feec8 (diff) | |
Merge with head
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, |