diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-12-05 17:40:04 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-12-05 17:40:04 -0500 |
| commit | 295a4c63b4912f05a729178e8e34ba26e92ff37b (patch) | |
| tree | 19fc1232fc6f8040ce5598fdd9649646116f7ea9 /indra/newview/llviewerjointmesh.cpp | |
| parent | 2d8ad89f33e9fa65dea11fd4c78962fc568ee00a (diff) | |
| parent | 05d58c91ef55fd90ea2f3e0f1a1199ac5e690b30 (diff) | |
merge changes for 5.0.0-release
Diffstat (limited to 'indra/newview/llviewerjointmesh.cpp')
| -rw-r--r-- | indra/newview/llviewerjointmesh.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerjointmesh.cpp b/indra/newview/llviewerjointmesh.cpp index bf7cf08c63..43a81ada49 100644 --- a/indra/newview/llviewerjointmesh.cpp +++ b/indra/newview/llviewerjointmesh.cpp @@ -203,7 +203,7 @@ void LLViewerJointMesh::uploadJointMatrices() // DrawElementsBLEND and utility code //-------------------------------------------------------------------- -// compate_int is used by the qsort function to sort the index array +// compare_int is used by the qsort function to sort the index array int compare_int(const void *a, const void *b) { if (*(U32*)a < *(U32*)b) |