diff options
| author | Adam Moss <moss@lindenlab.com> | 2009-02-03 17:56:26 +0000 |
|---|---|---|
| committer | Adam Moss <moss@lindenlab.com> | 2009-02-03 17:56:26 +0000 |
| commit | e188badaf29a1a02307f93864eed6737096bd9a1 (patch) | |
| tree | 767259ad3385fd9ede9722e04752bea008469f8c /indra/newview/llwlparamset.cpp | |
| parent | 4ad54702fce32905402cb6055c085ac14de188a2 (diff) | |
QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergeme
svn merge -r108355:109316
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/maint-viewer-12-uploadfees-qa108314
Whew.
Diffstat (limited to 'indra/newview/llwlparamset.cpp')
| -rw-r--r-- | indra/newview/llwlparamset.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llwlparamset.cpp b/indra/newview/llwlparamset.cpp index 1cb5ee7754..ea9c00ae81 100644 --- a/indra/newview/llwlparamset.cpp +++ b/indra/newview/llwlparamset.cpp @@ -69,7 +69,7 @@ LLWLParamSet::LLWLParamSet(void) : std::make_pair("gamma", LLVector4(2.0f, 2.0f, 2.0f, 0.0f)), }; std::map<std::string, LLVector4>::value_type const * endHardcodedPreset = - hardcodedPreset + sizeof(hardcodedPreset)/sizeof(hardcodedPreset[0]); + hardcodedPreset + LL_ARRAY_SIZE(hardcodedPreset); mParamValues.insert(hardcodedPreset, endHardcodedPreset); */ |