diff options
| author | Sabrina Shanman <cosmic@lindenlab.com> | 2022-04-05 20:22:24 +0000 |
|---|---|---|
| committer | Sabrina Shanman <cosmic@lindenlab.com> | 2022-04-05 20:22:24 +0000 |
| commit | c7d137067cae548bca919d0f0b49e4818d4fed31 (patch) | |
| tree | 0aed533fedae6de3e703a91effba9e63f5feaea8 /indra/newview/llfloaterworldmap.h | |
| parent | 268da741927ddde059fad4a47940fa050c9e0f4e (diff) | |
| parent | 9bca1aa8fb69c2163866dd7e5ce3b60fb62676b3 (diff) | |
Merged in SL-15232 (pull request #933)
SL-15232: Scroll mouse wheel to main map
Approved-by: Andrey Lihatskiy
Diffstat (limited to 'indra/newview/llfloaterworldmap.h')
| -rw-r--r-- | indra/newview/llfloaterworldmap.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/indra/newview/llfloaterworldmap.h b/indra/newview/llfloaterworldmap.h index 97e99297cf..c9724d37ac 100644 --- a/indra/newview/llfloaterworldmap.h +++ b/indra/newview/llfloaterworldmap.h @@ -44,6 +44,7 @@ class LLInventoryObserver; class LLItemInfo; class LLLineEditor; class LLTabContainer; +class LLWorldMapView; class LLFloaterWorldMap : public LLFloater { @@ -154,11 +155,7 @@ protected: void cacheLandmarkPosition(); private: - LLPanel* mPanel; // Panel displaying the map - - // Ties to LLWorldMapView::sMapScale, in pixels per region - F32 mCurZoomVal; - LLFrameTimer mZoomTimer; + LLWorldMapView* mMapView; // Panel displaying the map // update display of teleport destination coordinates - pos is in global coordinates void updateTeleportCoordsDisplay( const LLVector3d& pos ); |