22386b18b4
Merge LL 2.7.25
2015-02-24 21:22:32 -08:00
546b276eba
Fix merge issue
2015-01-18 17:18:23 +01:00
e52d57cba2
Merge LL V3.7.23
2015-01-15 15:44:43 +01:00
48fc17d6e1
Merge LL V3.7.16
2015-01-14 17:36:30 +01:00
4f076daeff
Merge downstream code and become 3.7.22
2014-12-02 10:41:20 -08:00
38a258d04a
merge
2014-12-01 16:16:11 -05:00
a45088cb6b
Merge LL V3.7.11
2015-01-12 12:54:15 +01:00
f4bfb1aadf
Merge LL V3.7.9 (AIS3 + SSA)
2014-10-22 02:02:08 +02:00
a30e0fd909
MAINT-4606 WIP - handle removing attachments that contain multiple mesh objects
2014-10-29 09:17:34 -04:00
d4dcae0ac9
MAINT-4501 FIXED Viewer spams error message if it can't find an audio device
2014-10-02 16:37:59 +03:00
33f66ac234
WIP on attachment offset management in joints
2014-08-27 16:52:52 -04:00
a4fc0b26b0
MAINT-3511 FIXED When one surface of mesh object is set transparent all object is invisible : compare rotation quaternions with predefined epsilon
2014-08-18 15:12:16 +03:00
0621810ab1
merge
2014-09-05 15:36:32 -04:00
94f945c2c6
WIP on attachment offset management in joints
2014-08-27 16:52:52 -04:00
bfa42c9e28
Merge downstream code and become 3.7.12
2014-07-07 16:17:53 -07:00
d760a6889d
Merge downstream code
2014-06-18 19:02:25 -07:00
e15002a11c
merge changes for 3.7.9-release
2014-06-16 11:42:37 -04:00
98720c3cec
Merge
2014-06-05 06:31:30 -07:00
67051b26ba
merge
2014-05-19 18:10:45 -04:00
7b9708a2e3
sunshine-external merge WIP
2014-05-13 10:02:26 -04:00
250db74bf9
Pull and merge viewer-release as version 3.7.8
2014-05-07 10:56:41 -07:00
a5568f942b
Merge downstream version 3.7.8 code
2014-05-07 15:28:13 -07:00
a98b4b6bee
merge changes for 3.7.7-release
2014-05-07 11:09:04 -04:00
75b93c15ab
MAINT-2245 FIXED Object's content doesn't display inside "Buy" dialog when prim is set for sale
2014-04-09 16:21:56 +03:00
36c8c92098
MAINT-3804 FIXED Crash in LLAudioEngine::getAudioData when playing gestures with audio device disabled.
2014-03-14 06:39:09 +02:00
d9e3a2948a
merge
2014-03-12 17:24:07 -04:00
5b846ed2a6
merge with release
2014-03-12 12:48:43 -07:00
0f3ba54a7e
merge changes for 3.7.3-release
2014-03-10 15:47:27 -04:00
dc353c205a
Merge
2014-06-10 20:27:31 -07:00
8863d9beaf
Compile fixes
2014-06-09 23:27:05 -07:00
6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
3fbaa553e0
Remove obsolete code.
2014-04-06 18:20:09 +02:00
3d1ac7c0ec
Merge LL 3.7.3 (Viewer-Bear fixes)
2014-03-17 14:14:15 -07:00
744cf6be8d
merge
2013-12-05 10:39:35 -05:00
0031e9a97b
merge up to 3.6.10-release; some of the storm-68 changes lost
2013-11-19 17:59:55 -05:00
17e9c872ad
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2013-11-11 19:17:49 -08:00
33efe8d3c2
SH-3419 Replace per-object time dilation factor with region-wide
...
Reviewed with Simon
2013-10-25 16:46:18 -07:00
1f8b37e9ad
merge
2013-10-16 11:52:43 -04:00
697d2e720b
renamed TimeBlock to BlockTimerStatHandle
2013-10-15 20:24:42 -07:00
80dfbbaacd
merge from viewer-release
2013-10-08 11:59:24 -07:00
754e8752a9
added initial memory usage tracking for lltrace
2013-10-03 14:30:34 -07:00
59628d6f85
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2013-10-01 14:28:39 -07:00
12f0f8cb72
changed over to manual naming of MemTrackable stats
...
changed claimMem and disclaimMem behavior to not pass through argument
added more mem tracking stats to floater_stats
2013-10-01 13:46:43 -07:00
053d97db1b
better memory usage for LLTrace (tighter packing of recording arrays)
...
removed complicated and unnecessary fast timer gapless handoff logic (it should be gapless anyway)
improved MemTrackable API, better separation of shadow and footprint
added memory usage stats to floater_stats.xml
2013-09-25 19:12:35 -07:00
3603c4f992
Merge ll 3.6.11
2013-11-23 20:22:24 -08:00
ac6797c71a
SH-3455 WIP - moved setAvatarObject() to run after the self av constructor. Disabled sendAgentWearablesUpdate.
2013-09-25 13:01:55 -04:00
95e34d86b9
The unbearable lightness of being norspec
2013-09-18 18:24:16 -07:00
cbe397ad13
changed fast timer over to using macro
...
another attempt to move mem stat into base class
2013-09-05 14:04:13 -07:00
2c6bc5afa5
SH-4433 WIP Interesting: Statistics > Ping Sim is always 0 ms
...
made getPrimaryAccumulator return a reference since it was an
always non-null pointer
changed unit conversion to perform lazy division in order to avoid truncation
of timer values
2013-08-21 14:06:57 -07:00
612892b45a
SH-4433 WIP: Interesting: Statistics > Ping Sim is always 0 ms
...
continued conversion to units system
made units perform type promotion correctly and preserve type in arithmetic
e.g. can now do LLVector3 in units
added typedefs for remaining common unit types, including implicits
2013-08-18 22:30:27 -07:00
Tank_Master