diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-08-18 16:54:34 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-08-18 16:54:34 +0000 |
| commit | 0710d0da2ba0d4c0fe66b890f1598d8df7ea4917 (patch) | |
| tree | cb9323d21b0316a5c2cdfa9143b7f4355c6188f1 /indra/newview/llfavoritesbar.cpp | |
| parent | ac1b723fd79b63a9dab94c839d3c0acb2ddde129 (diff) | |
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1378 https://svn.aws.productengine.com/secondlife/pe/stable-1@1386 -> viewer-2.0.0-3
EXT-357 EXT-370 EXT-385 EXT-409 EXT-472 EXT-479 EXT-513 EXT-532 EXT-541 EXT-544 EXT-546
Diffstat (limited to 'indra/newview/llfavoritesbar.cpp')
| -rw-r--r-- | indra/newview/llfavoritesbar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfavoritesbar.cpp b/indra/newview/llfavoritesbar.cpp index f739e159f3..7fc127f803 100644 --- a/indra/newview/llfavoritesbar.cpp +++ b/indra/newview/llfavoritesbar.cpp @@ -604,7 +604,7 @@ void LLFavoritesBarCtrl::doToSelected(const LLSD& userdata) } else if (action == "copy") { - LLInventoryClipboard::instance().add(mSelectedItemID); + LLInventoryClipboard::instance().store(mSelectedItemID); } else if (action == "paste") { |