58d6265662
SL-18423 Post-merge: restore RyeMutt's fix from SL-18412
2022-10-20 22:52:41 +03:00
e0ace0c722
Merge branch 'master' into DRTVWR-570-maint-Q
...
# Conflicts:
# indra/newview/llnetmap.cpp
# indra/newview/llnetmap.h
2022-10-20 22:34:11 +03:00
5456af4c8c
Fix various menu leaks and lazy creation in chiclets, bump floater, media controls, and the mini map
2022-10-19 16:28:34 -04:00
91606c7b60
Merge branch 'master' into DRTVWR-548-maint-N
2022-05-26 03:07:05 +03:00
6fb787cd10
SL-17463: Set the default for MiniMapRotate back to true (enable minimap rotation by default), but set MiniMapRotate to false for new installs
2022-05-20 11:56:31 -07:00
d4cadd53d4
SL-17058: Remove redundant minimap frustum color, hopefully fixing mac build.
...
So THAT's why the frustum transparency was different when rotating...
2022-04-05 11:55:34 -07:00
bd87a5b942
SL-17058: Convert frustum on minimap to arc from triangle
2022-04-05 11:55:34 -07:00
f2b57ac03b
SL-16916: Grey out "About Land" button in minimap context menu when land info is likely unavailable
2022-04-05 11:55:33 -07:00
f1b7ba6c28
SL-16916: Update minimap context menu with new options and reworded existing options
...
Map rotation: Split minimap "Rotate Map" context menu option into two options: "North at top" and "Camera at top"
Zoom:
- Adjust minimap context menu zoom presets: New presets are "far", "medium", "close", and "very close"
- Change default minimap zoom level from 128 to 64
- Currently selected minimap zoom level is now checked
About Land: Add "About Land" button to minimap context menu
Reword: Rearrange and adjust capitalization of the various context menu options
Code change: Remove unused zoom handling code in LLFloaterMap
2022-04-05 11:55:33 -07:00
6013e68ea2
SL-16918: Fix unneeded assignment to centered in LLNetMap::draw()
2022-04-05 11:55:33 -07:00
39e553fc11
SL-16918: Re-add "Auto-center map" button to minimap context menu, enable minimap auto-center by default again
2022-03-03 17:12:50 -08:00
fcbd928679
SL-16918: Minimap navigation improvements: Drag without holding shift, remove auto center, click button to re-center
2022-03-03 17:12:50 -08:00
0e927e92f3
SL-16824: Fix minimap tooltip hint not updating until viewer restart (double click to show map vs double click to teleport)
2022-03-03 12:30:59 -08:00
81da0dd2db
SL-16824: Change minimap hover tooltip. Show parcel name, owner name, and/or for sale info when available. Remove "shift-drag to pan" hint.
2022-03-03 12:30:58 -08:00
898079a39b
SL-16857: Display parcel borders on the minimap, enable by default, right click context menu option to disable
2022-02-23 17:14:38 -08:00
9f10853c03
SL-16887 FIXED Crash in LLNetMap::draw
2022-02-21 16:07:58 +02:00
8b92652806
SL-16386 replace gutted LLRender::setAlphaRejectSettings() with explicit flush()
2021-11-30 17:04:35 -07:00
d00272e0cc
SL-16099 Multi-threaded OpenGL usage on Windows, enable Core Profile and VAOs by default.
2021-10-11 16:03:40 +00:00
91fa31c065
Downstream merge from lindenlab/viewer-serval
2019-11-12 04:24:35 +02:00
7c9e92f494
SL-12016 Mini-map avatar icon (Z-position) fix
2019-09-26 19:24:54 +03:00
c61d0f4297
DRTVWR-493 LLUI to LLParamSingleton
2019-08-10 15:31:03 +03:00
573287b50f
DRTVWR-418: Fix API for LLTracker::stopTracking().
...
The signature for LLTracker::stopTracking() was silly: it accepted a void* for
the sole purpose of testing whether it was NULL. In other words, the parameter
was really a bool in void* clothing. Most callers passed NULL.
What got ugly was when you wanted to pass 'true', or a variable bool value.
Such values had to be cast to void*. In 64-bit land, the compiler correctly
flags that as extremely dubious practice.
But it's entirely unnecessary. Since stopTracking() wants a bool, change its
parameter to bool. Everybody wins.
(While at it, change a few related method params from BOOL to builtin bool.)
2016-12-20 09:44:10 -05:00
e8aa2dd71f
x64: Do not use a union of LLColor4U. Especially having the two pointer in there will blow up the struct to at least 8 byte, which will break VBO packing as this class needs to be 4 byte in size.
...
(transplanted from 847df86d6b5daa69dcfc428df18876a9c1e8bef6)
2016-04-22 14:58:25 +02:00
5822fb00b6
merge DRTVWR-398 build cleanup fixes
2016-03-07 12:41:11 -05:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
71a468c6fb
merge changes for other open sourc contributions
2015-07-30 11:09:00 -04:00
23711c9275
Rename llround(..) to ll_round(..) because of a collision with MS llround (long long round) in VS2013
2014-12-10 08:44:08 -08:00
cacaf21eb5
STORM-2088 Minimap no longer remembers zoom setting between sessions
2014-12-05 09:46:07 -05:00
a37c41e3f5
Update to build on Xcode 6.0: removal of some unused variables
2014-10-19 17:30:46 -07:00
fe518bde8e
merge with release
2013-11-06 17:22:04 -08:00
0d663f8d2c
STORM-1958: Only draw the user's netmap dot once
2013-07-23 15:31:00 +00:00
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
8de397b19e
SH-3931 WIP Interesting: Add graphs to visualize scene load metrics
...
changed LLCriticalDamp to LLSmoothInterpolation and sped up interpolator lookup
improvements to stats display of llstatbar
added scene load stats floater accessed with ctrl|shift|2
2013-03-18 08:43:03 -07:00
c06c35609c
Updating linux build to gcc4.6
2012-10-11 00:09:04 +00:00
3b2511661e
STORM-1793 1) Treat all mini-map altitudes above 1020 m as the same height 2) Improve z-level accuracy
...
With help from Aleric Inglewood
2012-01-27 08:33:26 -05:00
7c95af74f1
SH-2243 work in progress -- application side matrix stack management
2011-09-14 16:30:45 -05:00
89216a6c21
Merged with viewer-development.
...
The reason was to manually resolve a couple of merge problems, as upstream has had several changes since this was applied, and some of the changes overlapped.
2011-04-29 14:23:27 -07:00
cb47ae3264
merge changes for storm-971
2011-03-21 06:59:55 -04:00
2cddf137e3
STORM-971 FIXED Disable the 'Stop Tracking' menu item in Mini-map floater when tracking gets stopped.
...
- Removed the menu from LLFloaterMap (the mini-map floater)
that had conflicted with the one in the LLNetMap widget.
- Fixed updating of the "Stop Tracking" menu item; moved that code
out of draw() to avoid excessive updates.
- Preventively fixed LLTracker::isTracking() to return strictly 1 or 0
(BOOL is known to cause hard-to-debug side effects with values > 1
because it's essentially just an int and thus doesn't enforce
any limitations on the value).
2011-03-14 17:37:56 +02:00
9bac314ba0
Switched to using *_SQUARED constants instead of multiplied constants, and cleaned up a few other minor issues noted during review.
2011-03-12 23:39:10 -08:00
d4d292258e
Squared all dist_vec() based comparisons and other dist_vec() operations where sensible.
...
Not all instances of dist_vec() were squared, only those where it wouldn't (hopefully) change the functionality.
2011-03-10 22:07:06 -08:00
3c43ec4a96
SOCIAL-622 FIX Double clicking on mini map in people panel places a red circle that cannot be removed and tooltip references opening world map
2011-03-02 21:04:30 -08:00
2c9cd5f4b2
SOCIAL-612 FIX Double Click on mini-map in People Nearby tab opens world map
...
double click does nothing now
2011-03-01 19:49:19 -08:00
0d5b0cad14
Embed Minimap into the Nearby list of the People Sidebar
2011-01-26 19:22:42 -05:00
09c7d38166
STORM-467 Fix for minimap zoom does not persist to the next session
2010-12-18 16:44:51 -05:00
71fd7c89aa
VWR-17653 (SNOW-734) FIXED Show inspectors for avatars on the MiniMap
...
Reworked, as the original version clashed with the display names merge.
2010-09-07 21:51:41 +01:00
ffae589843
Post-convert merge by convert_monolith.py from /Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution
2010-09-03 17:41:39 +01:00
711ccfa57f
VWR-13221 (SNOW-188) SUPPLEMENTARY Allow panning of the minimap
...
Fix Linux build.
2010-09-01 15:05:24 +01:00
Andrey Lihatskiy