diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-10-21 09:16:56 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-10-21 09:16:56 -0400 |
| commit | 4c8e526b99cb717e9086dec87a94b56fecad8984 (patch) | |
| tree | 45294c593721be9bc8def1563b07438554dfa08b /indra/llui/llxuiparser.cpp | |
| parent | d3387faca57c560279a6b8b83711a789b84f0ecd (diff) | |
| parent | a0a61ff61e6cf38ccbd0d0a9eecb10d532feaf55 (diff) | |
merge changes for callum fixes and workarounds
Diffstat (limited to 'indra/llui/llxuiparser.cpp')
| -rwxr-xr-x | indra/llui/llxuiparser.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/llui/llxuiparser.cpp b/indra/llui/llxuiparser.cpp index 37d88cb9f9..f6a44338a4 100755 --- a/indra/llui/llxuiparser.cpp +++ b/indra/llui/llxuiparser.cpp @@ -58,8 +58,6 @@ static LLInitParam::Parser::parser_inspect_func_map_t sSimpleXUIInspectFuncs; const char* NO_VALUE_MARKER = "no_value"; -const S32 LINE_NUMBER_HERE = 0; - struct MaxOccursValues : public LLInitParam::TypeValuesHelper<U32, MaxOccursValues> { static void declareValues() |