diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-06-15 14:29:46 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-06-15 14:29:46 -0500 |
| commit | 99dc246ac843114f20f7aa99531451fcf46df3ed (patch) | |
| tree | d94a0a31e00c53ea359d9939d1928180d398b334 /indra/newview/llfavoritesbar.cpp | |
| parent | a519e34f02b4b2663fe082ba9ad12f1b423669cb (diff) | |
| parent | d76715776bb9e26577c4e505745eb2773e8a4796 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llfavoritesbar.cpp')
| -rw-r--r-- | indra/newview/llfavoritesbar.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfavoritesbar.cpp b/indra/newview/llfavoritesbar.cpp index 575b613ccf..4cbc9cab4a 100644 --- a/indra/newview/llfavoritesbar.cpp +++ b/indra/newview/llfavoritesbar.cpp @@ -1191,7 +1191,7 @@ void LLFavoritesBarCtrl::doToSelected(const LLSD& userdata) } else if (action == "paste") { - pastFromClipboard(); + pasteFromClipboard(); } else if (action == "delete") { @@ -1239,7 +1239,7 @@ BOOL LLFavoritesBarCtrl::isClipboardPasteable() const return TRUE; } -void LLFavoritesBarCtrl::pastFromClipboard() const +void LLFavoritesBarCtrl::pasteFromClipboard() const { LLInventoryModel* model = &gInventory; if(model && isClipboardPasteable()) |