summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatergesture.h
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2010-01-15 13:36:33 -0800
committerLeyla Farazha <leyla@lindenlab.com>2010-01-15 13:36:33 -0800
commite761ba064a2b5960efdfc94bb5baef85a7ec1a0a (patch)
treede9970a791adf551b9cfa65a0013118d33c77554 /indra/newview/llfloatergesture.h
parent56af8f1639a13adeb6f34e9988489aa5757a3184 (diff)
parent4c4c68a3408c85e49d365c31be93e006be612ab1 (diff)
Merge for EXT-1874, EXT-3800, EXT-4133
Diffstat (limited to 'indra/newview/llfloatergesture.h')
-rw-r--r--indra/newview/llfloatergesture.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloatergesture.h b/indra/newview/llfloatergesture.h
index 14e132900d..629d77b949 100644
--- a/indra/newview/llfloatergesture.h
+++ b/indra/newview/llfloatergesture.h
@@ -99,7 +99,7 @@ private:
void onClickPlay();
void onClickNew();
void onCommitList();
- void onCopyPastAction(const LLSD& command);
+ void onCopyPasteAction(const LLSD& command);
void onDeleteSelected();
LLUUID mSelectedID;