summaryrefslogtreecommitdiff
path: root/indra/newview/llfavoritesbar.h
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2012-06-15 14:29:46 -0500
committerDave Parks <davep@lindenlab.com>2012-06-15 14:29:46 -0500
commit99dc246ac843114f20f7aa99531451fcf46df3ed (patch)
treed94a0a31e00c53ea359d9939d1928180d398b334 /indra/newview/llfavoritesbar.h
parenta519e34f02b4b2663fe082ba9ad12f1b423669cb (diff)
parentd76715776bb9e26577c4e505745eb2773e8a4796 (diff)
Merge
Diffstat (limited to 'indra/newview/llfavoritesbar.h')
-rw-r--r--indra/newview/llfavoritesbar.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfavoritesbar.h b/indra/newview/llfavoritesbar.h
index 2f75b3bb0e..447d30f1f4 100644
--- a/indra/newview/llfavoritesbar.h
+++ b/indra/newview/llfavoritesbar.h
@@ -90,7 +90,7 @@ protected:
bool enableSelected(const LLSD& userdata);
void doToSelected(const LLSD& userdata);
BOOL isClipboardPasteable() const;
- void pastFromClipboard() const;
+ void pasteFromClipboard() const;
void showDropDownMenu();