diff options
author | Oz Linden <oz@lindenlab.com> | 2011-05-13 13:28:51 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-05-13 13:28:51 -0400 |
commit | 66c078de5e5a6b685d435f7b1a462d64ca80f35e (patch) | |
tree | a1fe4ac67d499a565ea98b390dedbeef0a62acc2 /indra/newview/llfolderviewitem.cpp | |
parent | 27fd0d1a93da8a2ad1aa445e8d8258f9e910ae8c (diff) | |
parent | e8ede07451c65aea898bc3f58a980b6b0d9af302 (diff) |
merge up to latest viewer-development
Diffstat (limited to 'indra/newview/llfolderviewitem.cpp')
-rw-r--r-- | indra/newview/llfolderviewitem.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfolderviewitem.cpp b/indra/newview/llfolderviewitem.cpp index 3c36248c1f..e9d1ad3a9e 100644 --- a/indra/newview/llfolderviewitem.cpp +++ b/indra/newview/llfolderviewitem.cpp @@ -1835,7 +1835,7 @@ void LLFolderViewFolder::sortBy(U32 order) return; } - // Propegate this change to sub folders + // Propagate this change to sub folders for (folders_t::iterator iter = mFolders.begin(); iter != mFolders.end();) { |