summaryrefslogtreecommitdiff
path: root/indra/newview/llfolderviewitem.cpp
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2011-05-17 19:21:55 +0000
committerDon Kjer <don@lindenlab.com>2011-05-17 19:21:55 +0000
commitae8ed3fc2d4a7dda92ad8fdb34bc559478eb9177 (patch)
tree64cd5d3328dbb56b03a03cf873a613005d0394dc /indra/newview/llfolderviewitem.cpp
parentc62ef53863bd01cb96de55e0250c8a8193b6c72b (diff)
parent113f532ee57eeeca4dc7eb6ca05f923f1f3543d3 (diff)
Merge with viewer-development
Diffstat (limited to 'indra/newview/llfolderviewitem.cpp')
-rw-r--r--indra/newview/llfolderviewitem.cpp2
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();)
{