From 39905b927d60e204438705728d2c214cb3f9ef81 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Thu, 2 Jul 2009 00:38:13 +0000 Subject: merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@873 https://svn.aws.productengine.com/secondlife/pe/stable@888 -> viewer-2.0.0-pe-4 --- indra/newview/llpanelteleporthistory.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/newview/llpanelteleporthistory.h') diff --git a/indra/newview/llpanelteleporthistory.h b/indra/newview/llpanelteleporthistory.h index 6f41c97eec..553385b37e 100644 --- a/indra/newview/llpanelteleporthistory.h +++ b/indra/newview/llpanelteleporthistory.h @@ -50,7 +50,8 @@ public: /*virtual*/ void onShowOnMap(); /*virtual*/ void onTeleport(); ///*virtual*/ void onCopySLURL(); - + /*virtual*/ void updateVerbs(); + void showTeleportHistory(); void handleItemSelect(const LLSD& data); -- cgit v1.2.3