diff options
| author | graham linden <graham@lindenlab.com> | 2013-03-12 11:28:07 -0700 |
|---|---|---|
| committer | graham linden <graham@lindenlab.com> | 2013-03-12 11:28:07 -0700 |
| commit | e950425fe37507243d1d2bfa2405b6f2ab5be284 (patch) | |
| tree | d77315adaedec41692317c57cf5344a7c1ae3479 /indra/newview | |
| parent | 45e46cf4c163a7af6544645b5216834d4598b85d (diff) | |
| parent | ab60c46a917366574fa7292b6e7142ece858bec5 (diff) | |
Merged lindenlab/viewer-cat into default
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llwlanimator.h | 1 | ||||
| -rw-r--r-- | indra/newview/llwlparammanager.h | 1 | ||||
| -rw-r--r-- | indra/newview/llwlparamset.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/llwlparamset.h | 1 |
4 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llwlanimator.h b/indra/newview/llwlanimator.h index 5223b45343..810f4cf7e5 100644 --- a/indra/newview/llwlanimator.h +++ b/indra/newview/llwlanimator.h @@ -137,3 +137,4 @@ private: }; #endif // LL_WL_ANIMATOR_H + diff --git a/indra/newview/llwlparammanager.h b/indra/newview/llwlparammanager.h index 72422500fc..e13aed98ed 100644 --- a/indra/newview/llwlparammanager.h +++ b/indra/newview/llwlparammanager.h @@ -412,3 +412,4 @@ inline LLVector4 LLWLParamManager::getRotatedLightDir(void) const } #endif + diff --git a/indra/newview/llwlparamset.cpp b/indra/newview/llwlparamset.cpp index 745cdae441..b307f19e8a 100644 --- a/indra/newview/llwlparamset.cpp +++ b/indra/newview/llwlparamset.cpp @@ -406,4 +406,5 @@ void LLWLParamSet::updateHashedNames() { mParamHashedNames.push_back(LLStaticHashedString(iter->first)); } -}
\ No newline at end of file +} + diff --git a/indra/newview/llwlparamset.h b/indra/newview/llwlparamset.h index 3e9f77ba6c..6e5f1d3a4b 100644 --- a/indra/newview/llwlparamset.h +++ b/indra/newview/llwlparamset.h @@ -243,3 +243,4 @@ inline F32 LLWLParamSet::getCloudScrollY() { #endif // LL_WLPARAM_SET_H + |