1733550573
Merge viewer-eep
2018-09-22 00:42:04 +02:00
096ea05a93
Rename getFogColor from water and sky settings to getWaterFogColor and getSkyFogColor.
2018-03-08 00:04:03 +00:00
2e644b4911
Compile fixes for Xcode 9 (and probably gcc).
2018-01-27 02:02:16 -06:00
2e04738b5a
Post merge cleanup.
2017-02-06 15:49:09 +01:00
2290d5ed16
Merge with viewer64, first pass.
2017-01-10 19:33:15 +01: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
4503a28aee
Merged with RLVa fixes
2016-12-03 17:13:17 +01:00
351c4f7709
Refactoring carousel: prefer RlvActions over RlvHandler wherever possible
...
-> clean up some quick wins; no functionality changes
--HG--
branch : RLVa
2016-11-20 11:57:08 +01:00
0046a76489
Merged with default tip (Revision 353c4cb529e2)
...
--HG--
branch : RLVa
2016-10-03 22:39:14 +02:00
f68896905b
Merge Firestorm LGPL
2016-05-23 16:09:09 +02:00
b25a22a2c1
Merged in lindenlab/viewer-release
2016-05-19 23:02:37 +03:00
2889c5bf40
Merge viewer-bear
2016-05-09 17:24:00 +02:00
e05c7d70d4
MAINT-1639 FIXED map seach clears itself when you are at the first place in map search
2016-04-28 13:06:55 +03:00
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
d96ac1a8ce
Save some unnecessary conversions
2015-09-20 18:07:42 +02:00
db87cb3f32
An adddition to previous commit, copypaste error of mine
2015-09-20 17:20:49 +02:00
404eb26b0e
FIRE-16969: Avatar tracker sounds, beeps; closer -> more frequent, further -> less frequent
2015-09-20 17:14:00 +02:00
c4d557d529
Merged with default tip (Revision aeab2661776f)
...
--HG--
branch : RLVa
2014-10-29 21:45:12 +02:00
6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
b82ee2275f
FIRE-13104: Draw tracker markers in combat feature only for people in view as pointed out by Ayamo Nozaki
2014-03-13 15:09:54 +01:00
5866bb7ef0
merge with release
2014-02-12 10:32:02 -08:00
7b2cc02863
Merge LL fitted mesh
2014-02-06 00:41:33 -08:00
44ea72848f
STORM-1981 Eliminate beam spreading
2013-11-26 09:30:53 -05:00
f04c2a781c
STORM-1981 Make pulse operate properly in both directions.
...
Move duplicated common code into its own function.
2013-11-25 13:54:43 -05:00
6b1d835f95
STORM-1981 Rough initial changes for evaluation purposes.
2013-11-24 15:46:21 -05:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
a2e22732f1
Summer cleaning - removed a lot of llcommon dependencies to speed up build times
...
consolidated most indra-specific constants in llcommon under indra_constants.h
fixed issues with operations on mixed unit types (implicit and explicit)
made LL_INFOS() style macros variadic in order to subsume other logging methods
such as ll_infos
added optional tag output to error recorders
2013-07-30 19:13:45 -07:00
10a289598b
Merged with default tip (Revision 74cc289067c8)
...
--HG--
branch : RLVa
2013-07-21 22:33:04 +02:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
f8ee277229
Various performance improvements in frequently visited areas
2013-07-29 21:06:11 +02:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
682b648cb3
FIRE-8234: Show distance from avatar rather than distance from camera in beacon hover text.
...
Distance from camera is somewhat useless.
2013-06-10 19:03:24 -06:00
9c395aa0c6
Merged with default tip (Revision f958326781de)
...
--HG--
branch : RLVa
2012-07-16 01:01:09 +02:00
cb24ec2e0d
merge LL 3.3.4 beta
...
autoreplace does not work (needs a hook in nearby chat), no cmd line option to add new stuff
spellcheck only works when packaged
2012-07-16 21:59:14 -07:00
f58cfdac22
STORM-1870 Avatar tracking beacon doesn't get disabled if DESTINATION_REACHED_RADIUS is reached
2012-06-01 16:01:40 -04:00
f36b769e5e
Fix for avatar tracker not stopping when avatar comes in reach (VWR-29048) from Jonathan Yap
2012-06-01 13:48:24 +02:00
7146c57d90
Added option to disable stopping of avatar tracker when reaching avatar (FIRE-6468)
2012-05-31 21:04:18 +02:00
adf6ca947e
Merge up to 26121/6a223218718e; latest RLVa from catznip-3.2.0 ( http:///bitbucket.org/Kitty_Barnett/catznip-3.2.0 ).
2012-01-23 17:09:53 +01:00
1714747536
After merge compare FS tree agsindt V/dev.
...
- Adjust whitespaces/include order to make FS source look as close to V/dev as possible.
- Include source in V/dev that's not in FS and comment it out with an annotation.
2012-01-18 19:04:59 +01:00
161c1b019f
Merge up from 24496 / a656486925e8 (FS tip) to 25952 / 931cb0061118 (V/Dev FUI tip)
...
Observations and broken stuff so far:
- LLSideTray is gone.
- LLBottomTray is gone.
- LLFloaterSnapshot was changed and gave lots of merge conflicts. Flickr upload will be broken.
- LLNearbyChat is derived from LLPanel now. That broke quite some stuff rearding autohiding and docking of chatbar.
- Profile floaters are gone and all web based now.
- Russian translation gave huge mere conflicts with the new russian xml files from LL. Unmergeable. I took the LL files.
- XUI files in general will need some love and testing.
2012-01-17 17:57:52 +01:00
e035e0bb59
Merged with default tip (Revision 1343609b39cf)
...
--HG--
branch : RLVa
2011-11-30 12:16:49 +01:00
2ae2d34bdb
Merged with default tip (Revision 9e390d76807f)
...
--HG--
branch : RLVa
2011-11-07 16:11:42 +01:00
e2b52009ea
merge
2011-10-24 15:32:58 -05:00
11bad6f75c
EXP-1352 Red directional arrow shown on teleport screen when selecting a destination from the destinations floater to teleport to
2011-10-19 13:43:27 -07:00
7c95af74f1
SH-2243 work in progress -- application side matrix stack management
2011-09-14 16:30:45 -05:00
2ee8154780
SH-2238, SH-2223, SH-SH-2242 glVertexAttrib throughout main render pipeline complete, preview renders and debug displays still pending. Also fixed a render glitch and a crash (JIRAs listed).
2011-08-10 13:01:14 -05:00
604345b918
Merged with .RLVa tip
...
--HG--
branch : RLVa
2011-02-19 01:12:23 +01:00
50d21a75a7
merge
2010-11-15 15:52:54 -08:00
1c2ef4090a
Merged with default tip (Revision f20bf424bd86)
...
--HG--
branch : RLVa
2010-10-30 17:28:00 +02:00
Ansariel