diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-12-15 19:36:03 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-12-15 19:36:03 -0800 |
| commit | e5c9fe005e2533b10ad9eeeec9041171f15247d0 (patch) | |
| tree | 43cfc17cf53709ed887506b655093f856126ae96 /indra/newview/llpreview.cpp | |
| parent | 3a02b9ec882c98009ae6c24913ee8a7a620b0f87 (diff) | |
| parent | 17d1d3c129c25dd27ddbf2d15ab8873a61c16658 (diff) | |
Automated merge with http://demeter:8000
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 |