diff options
| author | James Cook <james@lindenlab.com> | 2009-12-15 17:10:53 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-12-15 17:10:53 -0800 |
| commit | b030bb6e55df8574adfc38bc3d092176b34214b4 (patch) | |
| tree | 855f700ce9f689864513b59c6652cb8af37a45af /indra/newview/llpreview.cpp | |
| parent | 1bb4c9e1c9e9d797d4f49152afe4ff80ba22405d (diff) | |
| parent | 4428d4039fdf42932b39a861566a7ed2d2c2c946 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llpreview.cpp')
| -rw-r--r-- | indra/newview/llpreview.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llpreview.cpp b/indra/newview/llpreview.cpp index c95882931b..0b0c03e9e9 100644 --- a/indra/newview/llpreview.cpp +++ b/indra/newview/llpreview.cpp @@ -150,6 +150,13 @@ void LLPreview::onCommit() LLPointer<LLViewerInventoryItem> new_item = new LLViewerInventoryItem(item); new_item->setDescription(childGetText("desc")); + + std::string new_name = childGetText("name"); + if ( (new_item->getName() != new_name) && !new_name.empty()) + { + new_item->rename(childGetText("name")); + } + if(mObjectUUID.notNull()) { // must be in an object |