From 08d7003acad875f2284ccf51bc1583e63cdffc99 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Fri, 3 Jul 2020 14:15:01 -0400
Subject: [PATCH] Forgot to checkin header changes for netmap...
---
indra/newview/llnetmap.h | 35 ++++++++++++++++++++++++-----------
1 file changed, 24 insertions(+), 11 deletions(-)
diff --git a/indra/newview/llnetmap.h b/indra/newview/llnetmap.h
index d7f57d75029..bef77b2ab0e 100644
--- a/indra/newview/llnetmap.h
+++ b/indra/newview/llnetmap.h
@@ -40,6 +40,7 @@ class LLImageRaw;
class LLViewerTexture;
class LLFloaterMap;
class LLMenuGL;
+class LLViewerRegion;
class LLNetMap final : public LLUICtrl
{
@@ -66,25 +67,27 @@ class LLNetMap final : public LLUICtrl
static const F32 MAP_SCALE_MID;
static const F32 MAP_SCALE_MAX;
- /*virtual*/ void draw();
- /*virtual*/ BOOL handleScrollWheel(S32 x, S32 y, S32 clicks);
- /*virtual*/ BOOL handleMouseDown(S32 x, S32 y, MASK mask);
- /*virtual*/ BOOL handleMouseUp(S32 x, S32 y, MASK mask);
- /*virtual*/ BOOL handleHover( S32 x, S32 y, MASK mask );
- /*virtual*/ BOOL handleToolTip( S32 x, S32 y, MASK mask);
- /*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
+ /*virtual*/ void draw() override;
+ /*virtual*/ BOOL handleScrollWheel(S32 x, S32 y, S32 clicks) override;
+ /*virtual*/ BOOL handleMouseDown(S32 x, S32 y, MASK mask) override;
+ /*virtual*/ BOOL handleMouseUp(S32 x, S32 y, MASK mask) override;
+ /*virtual*/ BOOL handleHover( S32 x, S32 y, MASK mask ) override;
+ /*virtual*/ BOOL handleToolTip( S32 x, S32 y, MASK mask) override;
+ /*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE) override;
- /*virtual*/ BOOL postBuild();
- /*virtual*/ BOOL handleRightMouseDown( S32 x, S32 y, MASK mask );
+ /*virtual*/ BOOL postBuild() override;
+ /*virtual*/ BOOL handleRightMouseDown( S32 x, S32 y, MASK mask ) override;
/*virtual*/ BOOL handleClick(S32 x, S32 y, MASK mask);
- /*virtual*/ BOOL handleDoubleClick( S32 x, S32 y, MASK mask );
+ /*virtual*/ BOOL handleDoubleClick( S32 x, S32 y, MASK mask ) override;
+
+ void refreshParcelOverlay() { mUpdateParcelImage = true; }
void setScale( F32 scale );
void setToolTipMsg(const std::string& msg) { mToolTipMsg = msg; }
void renderScaledPointGlobal( const LLVector3d& pos, const LLColor4U &color, F32 radius );
private:
- const LLVector3d& getObjectImageCenterGlobal() { return mObjectImageCenterGlobal; }
+ const LLVector3d& getObjectImageCenterGlobal() const { return mObjectImageCenterGlobal; }
void renderPoint(const LLVector3 &pos, const LLColor4U &color,
S32 diameter, S32 relative_height = 0);
@@ -99,11 +102,14 @@ class LLNetMap final : public LLUICtrl
bool createImage(LLPointer<LLImageRaw>& rawimagep) const;
void createObjectImage();
+ void createParcelImage();
+ void renderPropertyLinesForRegion(const LLViewerRegion* pRegion, const LLColor4U& clrOverlay);
static bool outsideSlop(S32 x, S32 y, S32 start_x, S32 start_y, S32 slop);
private:
bool mUpdateObjectImage;
+ bool mUpdateParcelImage;
LLUIColor mBackgroundColor;
@@ -123,6 +129,13 @@ class LLNetMap final : public LLUICtrl
LLPointer<LLImageRaw> mObjectRawImagep;
LLPointer<LLViewerTexture> mObjectImagep;
+ LLVector3d mParcelImageCenterGlobal;
+ LLPointer<LLImageRaw> mParcelRawImagep;
+ LLPointer<LLViewerTexture> mParcelImagep;
+
+ boost::signals2::connection mParcelMgrConn;
+ boost::signals2::connection mParcelOverlayConn;
+
LLUUID mClosestAgentToCursor;
LLUUID mClosestAgentAtLastRightClick;
--
GitLab