diff options
| author | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-12-21 12:16:56 +0200 |
|---|---|---|
| committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-12-21 12:16:56 +0200 |
| commit | 77c97725516564f5595b2b71df54c1e32e08a7fc (patch) | |
| tree | 86887e93cad6945e1289ebd3fa9f7af3b9a01f4b /indra/newview/llpreview.cpp | |
| parent | 45b859b50b18d214559ee2da0376496da9222fdf (diff) | |
| parent | 05898105c88a2fa175bdc3d353461a6f61ad0616 (diff) | |
merge
--HG--
branch : product-engine
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 |