From 7dd3f5db0b7da458a49df8ae2f40138a83021dec Mon Sep 17 00:00:00 2001 From: Rye Mutt Date: Tue, 23 Jul 2024 21:41:58 -0400 Subject: Fix getChild calls during draw in LLFloaterWorldMap --- indra/newview/llfloaterworldmap.h | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) (limited to 'indra/newview/llfloaterworldmap.h') diff --git a/indra/newview/llfloaterworldmap.h b/indra/newview/llfloaterworldmap.h index 6765157e55..269b231e37 100644 --- a/indra/newview/llfloaterworldmap.h +++ b/indra/newview/llfloaterworldmap.h @@ -45,6 +45,11 @@ class LLItemInfo; class LLLineEditor; class LLTabContainer; class LLWorldMapView; +class LLButton; +class LLCheckBoxCtrl; +class LLSliderCtrl; +class LLSpinCtrl; +class LLSearchEditor; class LLFloaterWorldMap : public LLFloater { @@ -142,7 +147,6 @@ protected: void buildLandmarkIDLists(); void flyToLandmark(); void teleportToLandmark(); - void setLandmarkVisited(); void buildAvatarIDList(); void flyToAvatar(); @@ -195,6 +199,30 @@ private: LLCtrlListInterface * mListLandmarkCombo; LLCtrlListInterface * mListSearchResults; + LLButton* mTeleportButton = nullptr; + LLButton* mShowDestinationButton = nullptr; + LLButton* mCopySlurlButton = nullptr; + LLButton* mGoHomeButton = nullptr; + + LLCheckBoxCtrl* mPeopleCheck = nullptr; + LLCheckBoxCtrl* mInfohubCheck = nullptr; + LLCheckBoxCtrl* mTelehubCheck = nullptr; + LLCheckBoxCtrl* mLandSaleCheck = nullptr; + LLCheckBoxCtrl* mEventsCheck = nullptr; + LLCheckBoxCtrl* mEventsMatureCheck = nullptr; + LLCheckBoxCtrl* mEventsAdultCheck = nullptr; + + LLUICtrl* mAvatarIcon = nullptr; + LLUICtrl* mLandmarkIcon = nullptr; + LLUICtrl* mLocationIcon = nullptr; + + LLSearchEditor* mLocationEditor = nullptr; + LLUICtrl* mTeleportCoordSpinX = nullptr; + LLUICtrl* mTeleportCoordSpinY = nullptr; + LLUICtrl* mTeleportCoordSpinZ = nullptr; + + LLSliderCtrl* mZoomSlider = nullptr; + boost::signals2::connection mTeleportFinishConnection; }; -- cgit v1.2.3 From fceec45641cf6a4b7eecaf37ea080a184c279239 Mon Sep 17 00:00:00 2001 From: Ansariel Hiller Date: Sat, 27 Jul 2024 17:10:17 +0200 Subject: Fix a bunch of XUI warnings (#2120) --- indra/newview/llfloaterworldmap.h | 1 - 1 file changed, 1 deletion(-) (limited to 'indra/newview/llfloaterworldmap.h') diff --git a/indra/newview/llfloaterworldmap.h b/indra/newview/llfloaterworldmap.h index 269b231e37..a99100f5bd 100644 --- a/indra/newview/llfloaterworldmap.h +++ b/indra/newview/llfloaterworldmap.h @@ -206,7 +206,6 @@ private: LLCheckBoxCtrl* mPeopleCheck = nullptr; LLCheckBoxCtrl* mInfohubCheck = nullptr; - LLCheckBoxCtrl* mTelehubCheck = nullptr; LLCheckBoxCtrl* mLandSaleCheck = nullptr; LLCheckBoxCtrl* mEventsCheck = nullptr; LLCheckBoxCtrl* mEventsMatureCheck = nullptr; -- cgit v1.2.3 From 593479f33cecd81148a861c93c3f889e1ee5dc20 Mon Sep 17 00:00:00 2001 From: Ansariel Hiller Date: Sat, 3 Aug 2024 00:24:41 +0200 Subject: Display parcel name when clicking on a parcel on the world map (#2131) --- indra/newview/llfloaterworldmap.h | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) (limited to 'indra/newview/llfloaterworldmap.h') diff --git a/indra/newview/llfloaterworldmap.h b/indra/newview/llfloaterworldmap.h index a99100f5bd..2f2b2b7a0d 100644 --- a/indra/newview/llfloaterworldmap.h +++ b/indra/newview/llfloaterworldmap.h @@ -34,8 +34,9 @@ #include "llfloater.h" #include "llmapimagetype.h" -#include "lltracker.h" +#include "llremoteparcelrequest.h" #include "llslurl.h" +#include "lltracker.h" class LLCtrlListInterface; class LLFriendObserver; @@ -51,6 +52,21 @@ class LLSliderCtrl; class LLSpinCtrl; class LLSearchEditor; +class LLWorldMapParcelInfoObserver : public LLRemoteParcelInfoObserver +{ +public: + LLWorldMapParcelInfoObserver(const LLVector3d& pos_global); + ~LLWorldMapParcelInfoObserver(); + + void processParcelInfo(const LLParcelData& parcel_data); + void setParcelID(const LLUUID& parcel_id); + void setErrorStatus(S32 status, const std::string& reason); + +protected: + LLVector3d mPosGlobal; + LLUUID mParcelID; +}; + class LLFloaterWorldMap : public LLFloater { public: @@ -119,6 +135,8 @@ public: //Slapp instigated avatar tracking void avatarTrackFromSlapp( const LLUUID& id ); + void processParcelInfo(const LLParcelData& parcel_data, const LLVector3d& pos_global) const; + protected: void onGoHome(); @@ -169,8 +187,13 @@ private: // enable/disable teleport destination coordinates void enableTeleportCoordsDisplay( bool enabled ); - std::vector mLandmarkAssetIDList; - std::vector mLandmarkItemIDList; + void requestParcelInfo(const LLVector3d& pos_global, const LLVector3d& region_origin); + LLVector3d mRequestedGlobalPos; + bool mShowParcelInfo; + LLWorldMapParcelInfoObserver* mParcelInfoObserver; + + uuid_vec_t mLandmarkAssetIDList; + uuid_vec_t mLandmarkItemIDList; static const LLUUID sHomeID; -- cgit v1.2.3