diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2009-12-15 16:25:11 -0800 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2009-12-15 16:25:11 -0800 |
| commit | b76c4399833c202f6cc8a6fb903fee82e8fcd3f3 (patch) | |
| tree | 34d7789b2d8781299004f73dab1e059be82e6fcb /indra/newview/llpreview.cpp | |
| parent | 5242a31b5d643adcac1c0bf8318145d2805502a0 (diff) | |
EXT-2649 Replace 'Advanced > Set Away After 30 Minutes' with Away time options
EXT-2649 [BSI] Confirm on Drop
EXT-3416 Can't name a new gesture on creation (and renaming is HARD)
reviewed by James
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 |