summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorymodel.cpp
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2010-01-19 14:33:55 +0200
committerVadim Savchuk <vsavchuk@productengine.com>2010-01-19 14:33:55 +0200
commit85e48a1a6d5866136ed72c48b0d3399b4565532f (patch)
tree384d8dd7d75cbf4f409d6b879db4e67871eca815 /indra/newview/llinventorymodel.cpp
parentbc35caa7667307718712fb8f8434496aa55a0914 (diff)
parenta8cc535f544bb9b9941e0c45276db12d9c8e885d (diff)
Merge from default branch.
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llinventorymodel.cpp')
-rw-r--r--indra/newview/llinventorymodel.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index 4f38fdbde4..e44adfb511 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -3649,7 +3649,7 @@ void LLInventoryModel::updateItemsOrder(LLInventoryModel::item_array_t& items, c
LLViewerInventoryItem* src_item = *it_src;
items.erase(it_src);
- // target iterator can nt be valid due to container was changed, so update it.
+ // target iterator can not be valid because the container was changed, so update it.
it_dest = find_item_iter_by_uuid(items, dest_item_id);
items.insert(it_dest, src_item);
}