57feec9763
Merge branch 'viewer/build' of rlva/development
2020-03-21 11:26:59 +01:00
1ca7b29edf
Merge branch 'appearance/misc' into rlva/development
2019-12-27 15:49:47 +01: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
b98e2123a3
Merged with default tip (Revision 07528d0f9440)
...
--HG--
branch : RLVa
2018-03-29 11:11:20 +02: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
0046a76489
Merged with default tip (Revision 353c4cb529e2)
...
--HG--
branch : RLVa
2016-10-03 22:39:14 +02:00
4b884caf43
Added @shownames:<uuid> and @shownametags:<uuid> exceptions
...
-> [FIXED] "Pay" isn't disabled on the avatar context menu when @shownames restricted
-> [CHANGED] Show a notification when the user can't offer a teleport due to an RLV restriction
--HG--
branch : RLVa
2016-06-11 22:45:42 +02: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
839fe0fa12
Merged with default tip (Revision ffde74743e89)
...
--HG--
branch : RLVa
2015-05-09 00:53:24 +02: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
c4d557d529
Merged with default tip (Revision aeab2661776f)
...
--HG--
branch : RLVa
2014-10-29 21:45:12 +02: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
fd7e737a9b
Merged with default tip (Revision 4798c4f76be3)
...
--HG--
branch : RLVa
2013-11-06 13:46:33 +00:00
0d663f8d2c
STORM-1958: Only draw the user's netmap dot once
2013-07-23 15:31:00 +00:00
10a289598b
Merged with default tip (Revision 74cc289067c8)
...
--HG--
branch : RLVa
2013-07-21 22:33:04 +02: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
e1b955226d
Merged with viewer-sunshine tip (Revision bd1162cb6fbe)
...
--HG--
branch : RLVa
2013-02-11 23:04:05 +01:00
c06c35609c
Updating linux build to gcc4.6
2012-10-11 00:09:04 +00:00
ddc6afdd81
Merged with default tip (Revision f8183e357a6f)
...
--HG--
branch : RLVa
2012-04-21 22:29:42 +02: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
e035e0bb59
Merged with default tip (Revision 1343609b39cf)
...
--HG--
branch : RLVa
2011-11-30 12:16:49 +01:00
7c95af74f1
SH-2243 work in progress -- application side matrix stack management
2011-09-14 16:30:45 -05:00
a713ffa247
Merged with default tip (Revision ddfc2ed6aee1)
...
--HG--
branch : RLVa
2011-05-25 13:37:12 +02: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
7b0455ba0f
Merged with default tip (Revision 78d1d228709c)
...
--HG--
branch : RLVa
2011-03-19 16:14:42 +01: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
604345b918
Merged with .RLVa tip
...
--HG--
branch : RLVa
2011-02-19 01:12:23 +01: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
16a94fb8e2
- merge : region names on the minimap tooltip should be hidden when @showloc=n restricted
...
--HG--
branch : RLVa
2010-11-01 03:11:33 +01:00
dd554a73a1
- merge : agent names on the minimap tooltip should be anonymized when @shownames=n restricted
...
--HG--
branch : RLVa
2010-11-01 03:03:13 +01:00
1c2ef4090a
Merged with default tip (Revision f20bf424bd86)
...
--HG--
branch : RLVa
2010-10-30 17:28:00 +02: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
436f3ba929
Merged with default tip (Revision b7f03886bbc7)
...
--HG--
branch : RLVa
2010-09-02 03:27:33 +02:00
Kitty Barnett