diff options
author | Rider Linden <rider@lindenlab.com> | 2016-09-14 09:55:18 -0700 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2016-09-14 09:55:18 -0700 |
commit | 51236b7c9c2e74639be6360b42154f21fecc9df8 (patch) | |
tree | b720cf9f432e3bf6c2b100d25a0fce48e4be4219 /indra/newview/llfloatergesture.cpp | |
parent | 694fe9cfc5a63f825bf77f4630c2da57c16171bf (diff) | |
parent | 4fb100ac7a33174883184f1320d0beac08ead3a7 (diff) |
Merge
Diffstat (limited to 'indra/newview/llfloatergesture.cpp')
-rw-r--r-- | indra/newview/llfloatergesture.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfloatergesture.cpp b/indra/newview/llfloatergesture.cpp index 7da65a9a7c..d842106146 100644 --- a/indra/newview/llfloatergesture.cpp +++ b/indra/newview/llfloatergesture.cpp @@ -528,7 +528,8 @@ void LLFloaterGesture::onCopyPasteAction(const LLSD& command) LLInventoryItem* item = gInventory.getItem(*it); if(item && item->getInventoryType() == LLInventoryType::IT_GESTURE) { - LLClipboard::instance().addToClipboard(item->getUUID(),LLAssetType::AT_GESTURE); + LLWString item_name = utf8str_to_wstring(item->getName()); + LLClipboard::instance().addToClipboard(item_name, 0, item_name.size()); } } } |