Updated worldmap textures in minimap code to latest version from Kitty Barnett (Catznip viewer)
Ansariel
parent
2ff3c1e51c
commit
329867bf64
|
|
@ -0,0 +1,21 @@
|
|||
[World/Minimap]
|
||||
- added : "MiniMapObjects" setting to control the rendering of objects on the minimap
|
||||
-> enabled by default
|
||||
- added : property line overlay on the minimap
|
||||
- added : "Property Lines" context menu option on the mini-map to toggle showing property lines
|
||||
-> controls 'MiniMapPropertyLines' setting, defaults to on
|
||||
- added : (optionally) use world map tile texture for the mini-map region texture
|
||||
- added : "Terrain Textures" as an option to the mini-map "Show" context menu
|
||||
-> with "Terrain Textures" and "World Map Textures" as separated options it will hopefully become clearer what the texture option entails
|
||||
- added : (optionally) show for-sale parcels with a yellow highlight on the mini-map
|
||||
-> controlled by 'MiniMapForSaleParcels', defaults to off
|
||||
- added : colour collision parcels a transparent red
|
||||
-> controlled by 'MiniMapCollisionParcels', defaults to on
|
||||
- added : user-configurable "MiniMapParcelOverylay" color for the property lines on the mini-map
|
||||
- added : "Place Profile" menu item to the mini-map context menu
|
||||
- added : "View Profile" context menu item for singular and context sub-menu for multiple dots on the mini-map
|
||||
- changed : removed title bar from the mini-map + fixed vertical centering of directions
|
||||
- changed : moved mini-map zoom options into a "Zoom" sub-menu
|
||||
- changed : mini-map zoom levels for "Close", "Medium" and "Far" options
|
||||
-> removed dead code in LLFloaterMap::handleZoom()
|
||||
- changed : only show the "Stop Tracking" mini-map context menu item if we're actually tracking something
|
||||
|
|
@ -46,18 +46,18 @@
|
|||
#include "llagent.h"
|
||||
#include "llagentcamera.h"
|
||||
#include "llappviewer.h" // for gDisconnected
|
||||
// [SL:KB] - Patch: World-MiniMap | Checked: 2012-07-08 (Catznip-3.3.0)
|
||||
// [SL:KB] - Patch: World-MiniMap | Checked: 2012-07-08 (Catznip-3.3)
|
||||
#include "llavataractions.h"
|
||||
#include "llfloatersidepanelcontainer.h"
|
||||
// [/SL:KB]
|
||||
#include "llcallingcard.h" // LLAvatarTracker
|
||||
#include "llfloaterworldmap.h"
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3.0)
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3)
|
||||
#include "llparcel.h"
|
||||
// [/SL:KB]
|
||||
#include "lltracker.h"
|
||||
#include "llsurface.h"
|
||||
// [SL:KB] - Patch: World-MiniMap | Checked: 2012-07-08 (Catznip-3.3.0)
|
||||
// [SL:KB] - Patch: World-MiniMap | Checked: 2012-07-08 (Catznip-3.3)
|
||||
#include "lltrans.h"
|
||||
// [/SL:KB]
|
||||
#include "llviewercamera.h"
|
||||
|
|
@ -66,7 +66,7 @@
|
|||
#include "llviewertexturelist.h"
|
||||
#include "llviewermenu.h"
|
||||
#include "llviewerobjectlist.h"
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3.0)
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3)
|
||||
#include "llviewerparcelmgr.h"
|
||||
#include "llviewerparceloverlay.h"
|
||||
// [/SL:KB]
|
||||
|
|
@ -123,14 +123,14 @@ LLNetMap::LLNetMap (const Params & p)
|
|||
mMouseDown(0, 0),
|
||||
mPanning(false),
|
||||
// mUpdateNow(false),
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3.0)
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3)
|
||||
mUpdateObjectImage(false),
|
||||
mUpdateParcelImage(false),
|
||||
// [/SL:KB]
|
||||
mObjectImageCenterGlobal( gAgentCamera.getCameraPositionGlobal() ),
|
||||
mObjectRawImagep(),
|
||||
mObjectImagep(),
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3.0)
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3)
|
||||
mParcelImageCenterGlobal( gAgentCamera.getCameraPositionGlobal() ),
|
||||
mParcelRawImagep(),
|
||||
mParcelImagep(),
|
||||
|
|
@ -162,6 +162,17 @@ LLNetMap::~LLNetMap()
|
|||
//gSavedSettings.setF32("MiniMapScale", mScale);
|
||||
gSavedSettings.setF32("MiniMapScale", sScale);
|
||||
// </FS:Ansariel> Fixing borked minimap zoom level persistance
|
||||
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3)
|
||||
if (mParcelMgrConn.connected())
|
||||
{
|
||||
mParcelMgrConn.disconnect();
|
||||
}
|
||||
if (mParcelOverlayConn.connected())
|
||||
{
|
||||
mParcelMgrConn.disconnect();
|
||||
}
|
||||
// [/SL:KB]
|
||||
}
|
||||
|
||||
BOOL LLNetMap::postBuild()
|
||||
|
|
@ -177,7 +188,7 @@ BOOL LLNetMap::postBuild()
|
|||
// </FS:Ansariel>
|
||||
registrar.add("Minimap.Cam", boost::bind(&LLNetMap::handleCam, this));
|
||||
registrar.add("Minimap.StartTracking", boost::bind(&LLNetMap::handleStartTracking, this));
|
||||
// [SL:KB] - Patch: World-MiniMap | Checked: 2012-07-08 (Catznip-3.3.0)
|
||||
// [SL:KB] - Patch: World-MiniMap | Checked: 2012-07-08 (Catznip-3.3)
|
||||
registrar.add("Minimap.ShowProfile", boost::bind(&LLNetMap::handleShowProfile, this, _2));
|
||||
registrar.add("Minimap.TextureType", boost::bind(&LLNetMap::handleTextureType, this, _2));
|
||||
registrar.add("Minimap.ToggleOverlay", boost::bind(&LLNetMap::handleOverlayToggle, this, _2));
|
||||
|
|
@ -221,9 +232,9 @@ BOOL LLNetMap::postBuild()
|
|||
enable_registrar.add("Minimap.VisibleKickTeleportHome", boost::bind(&LLNetMap::canKickTeleportHome, this));
|
||||
// [/SL:KB]
|
||||
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3.0)
|
||||
LLViewerParcelMgr::instance().setCollisionUpdateCallback(boost::bind(&LLNetMap::refreshParcelOverlay, this));
|
||||
LLViewerParcelOverlay::setUpdateCallback(boost::bind(&LLNetMap::refreshParcelOverlay, this));
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3)
|
||||
mParcelMgrConn = LLViewerParcelMgr::instance().setCollisionUpdateCallback(boost::bind(&LLNetMap::refreshParcelOverlay, this));
|
||||
mParcelOverlayConn = LLViewerParcelOverlay::setUpdateCallback(boost::bind(&LLNetMap::refreshParcelOverlay, this));
|
||||
// [/SL:KB]
|
||||
|
||||
mPopupMenu = LLUICtrlFactory::getInstance()->createFromFile<LLMenuGL>("menu_mini_map.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
|
||||
|
|
@ -259,7 +270,7 @@ void LLNetMap::setScale( F32 scale )
|
|||
mPixelsPerMeter = mScale / REGION_WIDTH_METERS;
|
||||
mDotRadius = llmax(DOT_SCALE * mPixelsPerMeter, MIN_DOT_RADIUS);
|
||||
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3.0)
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3)
|
||||
mUpdateObjectImage = true;
|
||||
mUpdateParcelImage = true;
|
||||
// [/SL:KB]
|
||||
|
|
@ -293,7 +304,7 @@ void LLNetMap::draw()
|
|||
static LLUIColor map_frustum_rotating_color = LLUIColorTable::instance().getColor("MapFrustumRotatingColor", LLColor4::white);
|
||||
static LLUIColor map_chat_ring_color = LLUIColorTable::instance().getColor("MapChatRingColor", LLColor4::yellow);
|
||||
static LLUIColor map_shout_ring_color = LLUIColorTable::instance().getColor("MapShoutRingColor", LLColor4::red);
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-08-17 (Catznip-3.3.0)
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-08-17 (Catznip-3.3)
|
||||
static LLUIColor map_property_line = LLUIColorTable::instance().getColor("MiniMapPropertyLine", LLColor4::white);
|
||||
// [/SL:KB]
|
||||
|
||||
|
|
@ -302,7 +313,7 @@ void LLNetMap::draw()
|
|||
createObjectImage();
|
||||
}
|
||||
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3.0)
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3)
|
||||
if (mParcelImagep.isNull())
|
||||
{
|
||||
createParcelImage();
|
||||
|
|
@ -471,7 +482,7 @@ void LLNetMap::draw()
|
|||
// if (mUpdateNow || (map_timer.getElapsedTimeF32() > 0.5f))
|
||||
// {
|
||||
// mUpdateNow = false;
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3.0)
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3)
|
||||
// Locate the center
|
||||
LLVector3 posCenter = globalPosToView(gAgentCamera.getCameraPositionGlobal());
|
||||
posCenter.mV[VX] -= mCurPan.mV[VX];
|
||||
|
|
@ -480,7 +491,7 @@ void LLNetMap::draw()
|
|||
LLVector3d posCenterGlobal = viewPosToGlobal(llfloor(posCenter.mV[VX]), llfloor(posCenter.mV[VY]));
|
||||
|
||||
static LLCachedControl<bool> s_fShowObjects(gSavedSettings, "MiniMapObjects") ;
|
||||
if ( (s_fShowObjects) && ((mUpdateObjectImage) || ((map_timer.getElapsedTimeF32() > 0.5f))) )
|
||||
if ( (s_fShowObjects) && ((mUpdateObjectImage) || (map_timer.getElapsedTimeF32() > 0.5f)) )
|
||||
{
|
||||
mUpdateObjectImage = false;
|
||||
// [/SL:KB]
|
||||
|
|
@ -491,7 +502,7 @@ void LLNetMap::draw()
|
|||
// new_center.mV[VY] -= mCurPan.mV[VY];
|
||||
// new_center.mV[VZ] = 0.f;
|
||||
// mObjectImageCenterGlobal = viewPosToGlobal(llfloor(new_center.mV[VX]), llfloor(new_center.mV[VY]));
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3.0)
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3)
|
||||
mObjectImageCenterGlobal = posCenterGlobal;
|
||||
// [/SL:KB]
|
||||
|
||||
|
|
@ -507,7 +518,7 @@ void LLNetMap::draw()
|
|||
map_timer.reset();
|
||||
}
|
||||
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3.0)
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3)
|
||||
static LLCachedControl<bool> s_fShowPropertyLines(gSavedSettings, "MiniMapPropertyLines") ;
|
||||
if ( (s_fShowPropertyLines) && ((mUpdateParcelImage) || (dist_vec_squared2D(mParcelImageCenterGlobal, posCenterGlobal) > 9.0f)) )
|
||||
{
|
||||
|
|
@ -563,7 +574,7 @@ void LLNetMap::draw()
|
|||
}
|
||||
// [/SL:KB]
|
||||
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3.0)
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3)
|
||||
if (s_fShowPropertyLines)
|
||||
{
|
||||
map_center_agent = gAgent.getPosAgentFromGlobal(mParcelImageCenterGlobal) - camera_position;
|
||||
|
|
@ -592,11 +603,11 @@ void LLNetMap::draw()
|
|||
S32 local_mouse_y;
|
||||
//localMouse(&local_mouse_x, &local_mouse_y);
|
||||
LLUI::getMousePositionLocal(this, &local_mouse_x, &local_mouse_y);
|
||||
// [SL:KB] - Patch: World-MiniMap | Checked: 2012-07-08 (Catznip-3.3.0)
|
||||
// [SL:KB] - Patch: World-MiniMap | Checked: 2012-07-08 (Catznip-3.3)
|
||||
bool local_mouse = this->pointInView(local_mouse_x, local_mouse_y);
|
||||
// [/SL:KB]
|
||||
mClosestAgentToCursor.setNull();
|
||||
// [SL:KB] - Patch: World-MiniMap | Checked: 2012-07-08 (Catznip-3.3.0)
|
||||
// [SL:KB] - Patch: World-MiniMap | Checked: 2012-07-08 (Catznip-3.3)
|
||||
mClosestAgentsToCursor.clear();
|
||||
// [/SL:KB]
|
||||
F32 closest_dist_squared = F32_MAX; // value will be overridden in the loop
|
||||
|
|
@ -706,7 +717,7 @@ void LLNetMap::draw()
|
|||
}
|
||||
}
|
||||
|
||||
// [SL:KB] - Patch: World-MiniMap | Checked: 2012-07-08 (Catznip-3.3.0)
|
||||
// [SL:KB] - Patch: World-MiniMap | Checked: 2012-07-08 (Catznip-3.3)
|
||||
if (local_mouse)
|
||||
{
|
||||
// [/SL:KB]
|
||||
|
|
@ -722,7 +733,7 @@ void LLNetMap::draw()
|
|||
}
|
||||
mClosestAgentsToCursor.push_back(uuid);
|
||||
}
|
||||
// [SL:KB] - Patch: World-MiniMap | Checked: 2012-07-08 (Catznip-3.3.0)
|
||||
// [SL:KB] - Patch: World-MiniMap | Checked: 2012-07-08 (Catznip-3.3)
|
||||
}
|
||||
// [/SL:KB]
|
||||
// F32 dist_to_cursor_squared = dist_vec_squared(LLVector2(pos_map.mV[VX], pos_map.mV[VY]),
|
||||
|
|
@ -1248,7 +1259,7 @@ void LLNetMap::renderPoint(const LLVector3 &pos_local, const LLColor4U &color,
|
|||
}
|
||||
}
|
||||
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3.0)
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3)
|
||||
void LLNetMap::renderPropertyLinesForRegion(const LLViewerRegion* pRegion, const LLColor4U& clrOverlay)
|
||||
{
|
||||
const S32 imgWidth = (S32)mParcelImagep->getWidth();
|
||||
|
|
@ -1339,7 +1350,7 @@ void LLNetMap::renderPropertyLinesForRegion(const LLViewerRegion* pRegion, const
|
|||
// [/SL:KB]
|
||||
|
||||
//void LLNetMap::createObjectImage()
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3.0)
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3)
|
||||
bool LLNetMap::createImage(LLPointer<LLImageRaw>& rawimagep) const
|
||||
// [/SL:KB]
|
||||
{
|
||||
|
|
@ -1361,7 +1372,7 @@ bool LLNetMap::createImage(LLPointer<LLImageRaw>& rawimagep) const
|
|||
img_size <<= 1;
|
||||
}
|
||||
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3.0)
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3)
|
||||
if( rawimagep.isNull() || (rawimagep->getWidth() != img_size) || (rawimagep->getHeight() != img_size) )
|
||||
{
|
||||
rawimagep = new LLImageRaw(img_size, img_size, 4);
|
||||
|
|
@ -1384,7 +1395,7 @@ bool LLNetMap::createImage(LLPointer<LLImageRaw>& rawimagep) const
|
|||
// mUpdateNow = true;
|
||||
}
|
||||
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3.0)
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3)
|
||||
void LLNetMap::createObjectImage()
|
||||
{
|
||||
if (createImage(mObjectRawImagep))
|
||||
|
|
@ -1450,7 +1461,7 @@ BOOL LLNetMap::handleMouseUp( S32 x, S32 y, MASK mask )
|
|||
return FALSE;
|
||||
}
|
||||
|
||||
// [SL:KB] - Patch: World-MiniMap | Checked: 2012-07-08 (Catznip-3.3.0)
|
||||
// [SL:KB] - Patch: World-MiniMap | Checked: 2012-07-08 (Catznip-3.3)
|
||||
void LLNetMap::setAvatarProfileLabel(const LLUUID& av_id, const LLAvatarName& avName, const std::string& item_name)
|
||||
{
|
||||
avatar_name_cache_connection_map_t::iterator it = mAvatarNameCacheConnections.find(av_id);
|
||||
|
|
@ -1530,7 +1541,7 @@ BOOL LLNetMap::handleRightMouseDown(S32 x, S32 y, MASK mask)
|
|||
{
|
||||
if (mPopupMenu)
|
||||
{
|
||||
// [SL:KB] - Patch: World-MiniMap | Checked: 2012-07-08 (Catznip-3.3.0)
|
||||
// [SL:KB] - Patch: World-MiniMap | Checked: 2012-07-08 (Catznip-3.3)
|
||||
mClosestAgentRightClick = mClosestAgentToCursor;
|
||||
mClosestAgentsRightClick = mClosestAgentsToCursor;
|
||||
mPosGlobalRightClick = viewPosToGlobal(x, y);
|
||||
|
|
@ -1593,7 +1604,7 @@ BOOL LLNetMap::handleRightMouseDown(S32 x, S32 y, MASK mask)
|
|||
// [/SL:KB]
|
||||
mPopupMenu->buildDrawLabels();
|
||||
mPopupMenu->updateParent(LLMenuGL::sMenuContainer);
|
||||
// [SL:KB] - Patch: World-MiniMap | Checked: 2012-07-08 (Catznip-3.3.0)
|
||||
// [SL:KB] - Patch: World-MiniMap | Checked: 2012-07-08 (Catznip-3.3)
|
||||
mPopupMenu->setItemVisible("Stop Tracking", LLTracker::isTracking(0));
|
||||
mPopupMenu->setItemVisible("Stop Tracking Separator", LLTracker::isTracking(0));
|
||||
// [/SL:KB]
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ class LLImageRaw;
|
|||
class LLViewerTexture;
|
||||
class LLFloaterMap;
|
||||
class LLMenuGL;
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3.0)
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3)
|
||||
class LLViewerRegion;
|
||||
class LLAvatarName;
|
||||
// [/SL:KB]
|
||||
|
|
@ -83,7 +83,7 @@ public:
|
|||
/*virtual*/ BOOL handleClick(S32 x, S32 y, MASK mask);
|
||||
/*virtual*/ BOOL handleDoubleClick( S32 x, S32 y, MASK mask );
|
||||
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3.0)
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3)
|
||||
void refreshParcelOverlay() { mUpdateParcelImage = true; }
|
||||
// [/SL:KB]
|
||||
void setScale( F32 scale );
|
||||
|
|
@ -124,7 +124,7 @@ private:
|
|||
BOOL handleToolTipAgent(const LLUUID& avatar_id);
|
||||
static void showAvatarInspector(const LLUUID& avatar_id);
|
||||
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3.0)
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3)
|
||||
bool createImage(LLPointer<LLImageRaw>& rawimagep) const;
|
||||
void createObjectImage();
|
||||
void createParcelImage();
|
||||
|
|
@ -136,7 +136,7 @@ private:
|
|||
static bool outsideSlop(S32 x, S32 y, S32 start_x, S32 start_y, S32 slop);
|
||||
|
||||
// bool mUpdateNow;
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3.0)
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3)
|
||||
bool mUpdateObjectImage;
|
||||
bool mUpdateParcelImage;
|
||||
// [/SL:KB]
|
||||
|
|
@ -160,14 +160,17 @@ private:
|
|||
LLVector3d mObjectImageCenterGlobal;
|
||||
LLPointer<LLImageRaw> mObjectRawImagep;
|
||||
LLPointer<LLViewerTexture> mObjectImagep;
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3.0)
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3)
|
||||
LLVector3d mParcelImageCenterGlobal;
|
||||
LLPointer<LLImageRaw> mParcelRawImagep;
|
||||
LLPointer<LLViewerTexture> mParcelImagep;
|
||||
|
||||
boost::signals2::connection mParcelMgrConn;
|
||||
boost::signals2::connection mParcelOverlayConn;
|
||||
// [/SL:KB]
|
||||
|
||||
LLUUID mClosestAgentToCursor;
|
||||
// [SL:KB] - Patch: World-MiniMap | Checked: 2012-07-08 (Catznip-3.3.0)
|
||||
// [SL:KB] - Patch: World-MiniMap | Checked: 2012-07-08 (Catznip-3.3)
|
||||
LLVector3d mClosestAgentPosition;
|
||||
// [/SL:KB]
|
||||
// <FS:Ansariel> Synchronize tooltips throughout instances
|
||||
|
|
@ -197,7 +200,7 @@ private:
|
|||
void handleClearMark();
|
||||
void handleClearMarks();
|
||||
void handleCam();
|
||||
// [SL:KB] - Patch: World-MiniMap | Checked: 2012-07-08 (Catznip-3.3.0)
|
||||
// [SL:KB] - Patch: World-MiniMap | Checked: 2012-07-08 (Catznip-3.3)
|
||||
void handleOverlayToggle(const LLSD& sdParam);
|
||||
bool checkTextureType(const LLSD& sdParam) const;
|
||||
void handleTextureType(const LLSD& sdParam) const;
|
||||
|
|
|
|||
|
|
@ -122,7 +122,7 @@ LLViewerParcelMgr::LLViewerParcelMgr()
|
|||
mRenderSelection(TRUE),
|
||||
mCollisionBanned(0),
|
||||
mCollisionTimer(),
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3.0)
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3)
|
||||
mCollisionRegionHandle(0),
|
||||
mCollisionUpdateSignal(NULL),
|
||||
// [/SL:KB]
|
||||
|
|
@ -147,7 +147,7 @@ LLViewerParcelMgr::LLViewerParcelMgr()
|
|||
mHighlightSegments = new U8[(mParcelsPerEdge+1)*(mParcelsPerEdge+1)];
|
||||
resetSegments(mHighlightSegments);
|
||||
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3.0)
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3)
|
||||
mCollisionBitmap = new U8[getCollisionBitmapSize()];
|
||||
memset(mCollisionBitmap, 0, getCollisionBitmapSize());
|
||||
// [/SL:KB]
|
||||
|
|
@ -208,7 +208,7 @@ LLViewerParcelMgr::~LLViewerParcelMgr()
|
|||
delete[] mHighlightSegments;
|
||||
mHighlightSegments = NULL;
|
||||
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3.0)
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3)
|
||||
delete[] mCollisionBitmap;
|
||||
mCollisionBitmap = NULL;
|
||||
// [/SL:KB]
|
||||
|
|
@ -1761,20 +1761,20 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use
|
|||
// / 8;
|
||||
// U8* bitmap = new U8[ bitmap_size ];
|
||||
// msg->getBinaryDataFast(_PREHASH_ParcelData, _PREHASH_Bitmap, bitmap, bitmap_size);
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3.0)
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3)
|
||||
msg->getBinaryDataFast(_PREHASH_ParcelData, _PREHASH_Bitmap, parcel_mgr.mCollisionBitmap, parcel_mgr.getCollisionBitmapSize());
|
||||
// [/SL:KB]
|
||||
|
||||
parcel_mgr.resetSegments(parcel_mgr.mCollisionSegments);
|
||||
// parcel_mgr.writeSegmentsFromBitmap( bitmap, parcel_mgr.mCollisionSegments );
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3.0)
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3)
|
||||
parcel_mgr.writeSegmentsFromBitmap(parcel_mgr.mCollisionBitmap, parcel_mgr.mCollisionSegments);
|
||||
// [/SL:KB]
|
||||
|
||||
// delete[] bitmap;
|
||||
// bitmap = NULL;
|
||||
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3.0)
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3)
|
||||
LLViewerRegion* pRegion = LLWorld::getInstance()->getRegion(msg->getSender());
|
||||
parcel_mgr.mCollisionRegionHandle = (pRegion) ? pRegion->getHandle() : 0;
|
||||
|
||||
|
|
@ -2586,8 +2586,8 @@ void LLViewerParcelMgr::onTeleportFailed()
|
|||
mTeleportFailedSignal();
|
||||
}
|
||||
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3.0)
|
||||
boost::signals2::connection LLViewerParcelMgr::setCollisionUpdateCallback(const collision_update_signal_t::slot_type & cb)
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3)
|
||||
boost::signals2::connection LLViewerParcelMgr::setCollisionUpdateCallback(const collision_update_signal_t::slot_type& cb)
|
||||
{
|
||||
if (!mCollisionUpdateSignal)
|
||||
mCollisionUpdateSignal = new collision_update_signal_t();
|
||||
|
|
|
|||
|
|
@ -165,7 +165,7 @@ public:
|
|||
LLParcel* getHoverParcel() const;
|
||||
|
||||
LLParcel* getCollisionParcel() const;
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3.0)
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3)
|
||||
const U8* getCollisionBitmap() const { return mCollisionBitmap; }
|
||||
size_t getCollisionBitmapSize() const { return mParcelsPerEdge * mParcelsPerEdge / 8; }
|
||||
U64 getCollisionRegionHandle() const { return mCollisionRegionHandle; }
|
||||
|
|
@ -365,7 +365,7 @@ private:
|
|||
// Watch for pending collisions with a parcel you can't access.
|
||||
// If it's coming, draw the parcel's boundaries.
|
||||
LLParcel* mCollisionParcel;
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3.0)
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3)
|
||||
U8* mCollisionBitmap;
|
||||
U64 mCollisionRegionHandle;
|
||||
collision_update_signal_t* mCollisionUpdateSignal;
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@
|
|||
|
||||
const U8 OVERLAY_IMG_COMPONENTS = 4;
|
||||
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3.0)
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3)
|
||||
LLViewerParcelOverlay::update_signal_t* LLViewerParcelOverlay::mUpdateSignal = NULL;
|
||||
// [/SL:KB]
|
||||
|
||||
|
|
@ -868,7 +868,7 @@ void LLViewerParcelOverlay::idleUpdate(bool force_update)
|
|||
{
|
||||
updateOverlayTexture();
|
||||
updatePropertyLines();
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3.0)
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3)
|
||||
if (mUpdateSignal)
|
||||
(*mUpdateSignal)(mRegion);
|
||||
// [/SL:KB]
|
||||
|
|
@ -1025,8 +1025,8 @@ S32 LLViewerParcelOverlay::renderPropertyLines ()
|
|||
return drawn;
|
||||
}
|
||||
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3.0)
|
||||
boost::signals2::connection LLViewerParcelOverlay::setUpdateCallback(const update_signal_t::slot_type & cb)
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3)
|
||||
boost::signals2::connection LLViewerParcelOverlay::setUpdateCallback(const update_signal_t::slot_type& cb)
|
||||
{
|
||||
if (!mUpdateSignal)
|
||||
mUpdateSignal = new update_signal_t();
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ public:
|
|||
|
||||
BOOL isBuildCameraAllowed(const LLVector3& pos) const;
|
||||
F32 getOwnedRatio() const;
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3.0)
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3)
|
||||
const U8* getOwnership() const { return mOwnership; }
|
||||
// [/SL:KB]
|
||||
|
||||
|
|
@ -84,7 +84,7 @@ public:
|
|||
void idleUpdate(bool update_now = false);
|
||||
void updateGL();
|
||||
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3.0)
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3)
|
||||
typedef boost::signals2::signal<void (const LLViewerRegion*)> update_signal_t;
|
||||
static boost::signals2::connection setUpdateCallback(const update_signal_t::slot_type & cb);
|
||||
// [/SL:KB]
|
||||
|
|
@ -131,7 +131,7 @@ private:
|
|||
F32* mVertexArray;
|
||||
U8* mColorArray;
|
||||
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3.0)
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3)
|
||||
static update_signal_t* mUpdateSignal;
|
||||
// [/SL:KB]
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1902,7 +1902,7 @@ F32 LLViewerRegion::getLandHeightRegion(const LLVector3& region_pos)
|
|||
return mImpl->mLandp->resolveHeightRegion( region_pos );
|
||||
}
|
||||
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3.0)
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3)
|
||||
LLViewerTexture* LLViewerRegion::getWorldMapTile() const
|
||||
{
|
||||
if (!mWorldMapTile)
|
||||
|
|
@ -1919,7 +1919,7 @@ LLViewerTexture* LLViewerRegion::getWorldMapTile() const
|
|||
// [/SL:KB]
|
||||
|
||||
//bool LLViewerRegion::isAlive()
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3.0)
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3)
|
||||
bool LLViewerRegion::isAlive() const
|
||||
// [/SL:KB]
|
||||
{
|
||||
|
|
|
|||
|
|
@ -139,7 +139,7 @@ public:
|
|||
inline BOOL getReleaseNotesRequested() const;
|
||||
|
||||
// bool isAlive(); // can become false if circuit disconnects
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3.0)
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3)
|
||||
bool isAlive() const; // can become false if circuit disconnects
|
||||
|
||||
LLViewerTexture* getWorldMapTile() const;
|
||||
|
|
|
|||
Loading…
Reference in New Issue