Minimap enhancements!!
Much of this patch comes from upstream and Kitty Barnett, or is inspired from their works This commit applies the World-Minimap patches from Catznip. Catznip stuffs: - Issue 1383: Parcel lines on mini map - Show parcels on the minimap - Minimap menu: "Show" submenu: "Property Lines" "Parcels for Sale" - Option to have world map textures on the minimap - Minimap menu: "World Map Textures" - Singular touch: Made this comply with hypergridding. The minimap will now scroll zoom based on where your mouse is if centering on camera is off. A lot of cruft was cleaned up in this merge, a lot of gSavedSettings lookups in draw were converted to LLCachedControls, some license updates were performed. Finally: By myself, but inspired by upstream and requested in the group before: - Option to show tracking circles around people selected on the radar while the radar is visible - Minimap menu: "Show" submenu: "Radar Tracking Circles"
This commit is contained in:
@@ -75,6 +75,9 @@ class LLDataPacker;
|
||||
class LLDataPackerBinaryBuffer;
|
||||
class LLHost;
|
||||
class LLBBox;
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-07-26 (Catznip-3.3)
|
||||
class LLViewerTexture;
|
||||
// [/SL:KB]
|
||||
|
||||
class LLViewerRegionImpl;
|
||||
|
||||
@@ -143,7 +146,12 @@ public:
|
||||
inline BOOL getRestrictPushObject() const;
|
||||
inline BOOL getReleaseNotesRequested() const;
|
||||
|
||||
bool isAlive(); // can become false if circuit disconnects
|
||||
// bool isAlive(); // can become false if circuit disconnects
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3.0)
|
||||
bool isAlive() const; // can become false if circuit disconnects
|
||||
|
||||
LLViewerTexture* getWorldMapTile() const;
|
||||
// [/SL:KB]
|
||||
|
||||
void setWaterHeight(F32 water_level);
|
||||
F32 getWaterHeight() const;
|
||||
@@ -455,6 +463,10 @@ private:
|
||||
LLDynamicArray<U32> mCacheMissFull;
|
||||
LLDynamicArray<U32> mCacheMissCRC;
|
||||
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-07-26 (Catznip-3.3)
|
||||
mutable LLPointer<LLViewerTexture> mWorldMapTile;
|
||||
// [/SL:KB]
|
||||
|
||||
bool mAlive; // can become false if circuit disconnects
|
||||
bool mCapabilitiesReceived;
|
||||
bool mFeaturesReceived;
|
||||
|
||||
Reference in New Issue
Block a user