From 7afa8058aae0d5363cc19c7df1e6d2d7ec3bf7ac Mon Sep 17 00:00:00 2001 From: Josh Bell <josh@lindenlab.com> Date: Thu, 1 Nov 2007 22:02:35 +0000 Subject: svn merge -r 72652:72881 svn+ssh://svn.lindenlab.com/svn/linden/branches/sl-search-11 --> release QAR-11: pair-reviewed the merge w/ Sam. --- indra/newview/llfloaterworldmap.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'indra/newview/llfloaterworldmap.h') diff --git a/indra/newview/llfloaterworldmap.h b/indra/newview/llfloaterworldmap.h index 1757f866d8..b98bbbbe44 100644 --- a/indra/newview/llfloaterworldmap.h +++ b/indra/newview/llfloaterworldmap.h @@ -108,6 +108,9 @@ public: // Catch changes in the sim list void updateSims(bool found_null_sim); + // teleport to the tracked item, if there is one + void teleport(); + protected: static void onPanBtn( void* userdata ); @@ -123,7 +126,7 @@ protected: static void onClearBtn(void*); static void onFlyBtn(void*); - static void onTeleportBtn(void*); + static void onClickTeleportBtn(void*); static void onShowTargetBtn(void*); static void onShowAgentBtn(void*); static void onCopySLURL(void*); @@ -136,9 +139,6 @@ protected: // fly to the tracked item, if there is one void fly(); - // teleport to the tracked item, if there is one - void teleport(); - void buildLandmarkIDLists(); static void onGoToLandmarkDialog(S32 option,void* userdata); void flyToLandmark(); -- cgit v1.2.3