From 3c36214993ea0971fa167629a997fe2cda2a2049 Mon Sep 17 00:00:00 2001 From: Armin Weatherwax Date: Mon, 13 Sep 2010 20:47:57 +0200 Subject: Henri Beauchamp: use http map if possible. Fixes broken map in SL + http map possible for OS --- linden/indra/newview/llfloaterworldmap.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'linden/indra/newview/llfloaterworldmap.h') diff --git a/linden/indra/newview/llfloaterworldmap.h b/linden/indra/newview/llfloaterworldmap.h index 2153921..83345ed 100644 --- a/linden/indra/newview/llfloaterworldmap.h +++ b/linden/indra/newview/llfloaterworldmap.h @@ -68,8 +68,6 @@ public: static void toggle(void*); static void hide(void*); - static void addServer(const std::string& server); - /*virtual*/ void reshape( S32 width, S32 height, BOOL called_from_parent = TRUE ); /*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask); /*virtual*/ BOOL handleScrollWheel(S32 x, S32 y, S32 clicks); @@ -103,7 +101,6 @@ public: void clearLocationSelection(BOOL clear_ui = FALSE); void clearAvatarSelection(BOOL clear_ui = FALSE); void clearLandmarkSelection(BOOL clear_ui = FALSE); - void clearGridSelection(BOOL clear_ui = FALSE); // Adjust the maximally zoomed out limit of the zoom slider so you can // see the whole world, plus a little. @@ -118,9 +115,8 @@ public: protected: static void onPanBtn( void* userdata ); - static void onGridManager(void* data); - static void onGoHome(void* data); + static void onLandmarkComboPrearrange( LLUICtrl* ctrl, void* data ); static void onLandmarkComboCommit( LLUICtrl* ctrl, void* data ); @@ -162,14 +158,13 @@ protected: static void onLocationCommit( void* userdata ); static void onCommitLocation( LLUICtrl* ctrl, void* userdata ); static void onCommitSearchResult( LLUICtrl* ctrl, void* userdata ); - static void onSelectServer(LLUICtrl*, void* userdata); void cacheLandmarkPosition(); protected: LLTabContainer* mTabs; - // Sets gMapScale, in pixels per region + // Sets sMapScale, in pixels per region F32 mCurZoomVal; LLFrameTimer mZoomTimer; -- cgit v1.1