callum_linden
|
e6fb7564b0
|
Automatic merge with head
|
2016-05-06 14:32:39 -07:00 |
|
callum_linden
|
94a8c11389
|
Merge with https://bitbucket.org/oz_linden/maint-5974 to pick up a variety of fixes
|
2016-05-06 13:41:46 -07:00 |
|
callum_linden
|
c5d6bfe8ae
|
Merge with viewer-release
|
2016-05-06 13:40:29 -07:00 |
|
AndreyL ProductEngine
|
6f5f307e0a
|
Merged in oz_linden/maint-5974
|
2016-05-06 23:32:00 +03:00 |
|
Brad Payne (Vir Linden)
|
d69c01ba80
|
merge
|
2016-05-06 16:29:34 -04:00 |
|
AndreyL ProductEngine
|
ffbbc30d1a
|
Merged in lindenlab/viewer-lynx
|
2016-05-06 23:26:24 +03:00 |
|
AndreyL ProductEngine
|
f47b0b146e
|
Merged in oz_linden/maint-5974
|
2016-05-06 23:23:21 +03:00 |
|
Andrey Lihatskiy
|
8e91c90ca3
|
Merged in andreyl_productengine/viewer-lion-marchcat (pull request #37)
MAINT-6376 Disable loading surface textures in the wireframe mode
|
2016-05-06 19:55:46 +03:00 |
|
Brad Payne (Vir Linden)
|
2d8b53854e
|
merge
|
2016-05-06 11:00:47 -04:00 |
|
AndreyL ProductEngine
|
b32d00308e
|
Merged in lindenlab/viewer-release
|
2016-05-06 17:31:36 +03:00 |
|
Oz Linden
|
950c41d184
|
merge 4.0.4-release and MAINT-5974
|
2016-05-06 10:28:42 -04:00 |
|
AndreyL ProductEngine
|
7c09c64878
|
Merged in lindenlab/viewer-bear
|
2016-05-06 17:26:35 +03:00 |
|
Brad Payne (Vir Linden)
|
e0cb5438a5
|
SL-315 - notes on resetSkeleton()
|
2016-05-06 10:17:56 -04:00 |
|
Oz Linden
|
7f5e6cea12
|
fix cmake warning by conditionalizing dependency that does not exist on Macs
|
2016-05-06 09:19:12 -04:00 |
|
Oz Linden
|
a07a8cbf6e
|
merge changes for 4.0.4-release
|
2016-05-06 09:05:51 -04:00 |
|
Oz Linden
|
94559950a2
|
increment viewer version to 4.0.5
|
2016-05-06 08:56:31 -04:00 |
|
Oz Linden
|
1114d681f1
|
Added tag 4.0.4-release for changeset 0a5de9ec2cb8
|
2016-05-06 08:56:31 -04:00 |
|
AndreyL ProductEngine
|
51cf02086a
|
MAINT-6376 Disable loading surface textures in the wireframe mode
|
2016-05-06 15:00:19 +03:00 |
|
Mnikolenko Productengine
|
042930b59a
|
linux build fix
|
2016-05-06 12:43:48 +03:00 |
|
Mnikolenko ProductEngine
|
cec81209b7
|
mac build fix
|
2016-05-06 11:09:46 +03:00 |
|
Oz Linden
|
c938e16506
|
various changes required to compile on new clang
|
2016-05-05 13:53:07 -04:00 |
|
pavelkproductengine
|
8b3f4ec5f5
|
MAINT-6226 Incorporate a customized Snapshot feature to Outfit Browser flow
Removed odd controls like custom resolution spinners etc
|
2016-05-05 19:43:02 +03:00 |
|
Mnikolenko ProductEngine
|
bdeeb6451f
|
MAINT-6381 Right click on Outfit Folder behavior
|
2016-05-05 16:32:12 +03:00 |
|
Mnikolenko ProductEngine
|
0a73840dd8
|
MAINT-6381 Right click on Outfit Folder behavior
|
2016-05-05 16:30:41 +03:00 |
|
Oz Linden
|
20198b750d
|
cosmetic fixes to basic graphics and preset selection
|
2016-05-04 18:01:59 -04:00 |
|
Oz Linden
|
0e5c8ed390
|
add max avatar complexity slider to basic graphics preferences
|
2016-05-04 10:16:53 -04:00 |
|
Brad Payne (Vir Linden)
|
393072b9d6
|
SL-344 - contributions.txt update
|
2016-05-04 08:43:26 -04:00 |
|
Brad Payne (Vir Linden)
|
d5befbf21c
|
SL-373 - package slider support
|
2016-05-04 08:34:43 -04:00 |
|
Brad Payne (Vir Linden)
|
41dee0f748
|
MAINT-1211 - updated contributions.txt
|
2016-05-04 08:31:25 -04:00 |
|
Brad Payne (Vir Linden)
|
421f7ea0bd
|
MAINT-1211 - fix for female torso muscles slider (via Adeon Writer)
|
2016-05-04 08:28:49 -04:00 |
|
Mnikolenko Productengine
|
eae82c8e47
|
MAINT-1513 FIXED Label of new folder doesn't disappear while closing Inventory by hot hey
|
2016-05-04 14:59:22 +03:00 |
|
Mnikolenko Productengine
|
b2fd397818
|
MAINT-6220 enable searching of the friend list with the classic username of the avatar.
|
2016-05-04 11:31:00 +03:00 |
|
Ansariel
|
dac6a7a4e3
|
Fixed disabling of Windows error reporting
|
2016-05-02 16:34:37 +02:00 |
|
Ansariel Hiller
|
e5b206c321
|
Fixed startup crash on Windows
|
2016-05-02 11:34:14 +00:00 |
|
Brad Payne (Vir Linden)
|
24e1a20609
|
SL-368 - removed enhanced skeleton option from preference dialog. Underlying code is still there but may or may not work with the current skeleton (spine joints?)
|
2016-04-29 16:20:52 -04:00 |
|
Oz Linden
|
9a83367e43
|
MAINT-6373: allow user to ignore notices about whether or not they are being rendered
|
2016-04-29 14:07:57 -04:00 |
|
pavelkproductengine
|
4125bebce7
|
MAINT-6226 Incorporate a customized Snapshot feature to Outfit Browser flow
Initial version, further refactoring pending
|
2016-04-29 20:28:11 +03:00 |
|
andreykproductengine
|
18a2381111
|
MAINT-6370 Second Life uninstall does not remove registry keys handling secondlife protocols
|
2016-04-29 19:32:20 +03:00 |
|
Brad Payne (Vir Linden)
|
ec471497f5
|
SL-375, SL-378 - rudimentary logging info to list joint offsets during mesh import. dae_tool.py work to enable joint offset tweaking.
|
2016-04-29 11:25:17 -04:00 |
|
Oz Linden
|
f495ca8f1a
|
Adjust some avatar complexity defaults (mostly slightly upwards)
Make more settings between mac and windows the same
Remove solaris and xp featuretables, since we don't support them any more
|
2016-04-29 10:52:43 -04:00 |
|
AndreyL ProductEngine
|
2b731af53a
|
Merged in lindenlab/viewer-bear
|
2016-04-28 23:11:42 +03:00 |
|
Oz Linden
|
ff6d4b517f
|
minor code clarity improvements
|
2016-04-28 14:42:13 -04:00 |
|
Brad Payne (Vir Linden)
|
3da9762eee
|
SL-374, SL-375 - dae_tool.py for dae manipulation, initially to make joint offset test content
|
2016-04-28 13:44:36 -04:00 |
|
Oz Linden
|
e81135b5d8
|
adjust avatar complexity defaults to be more generous and more consistent
|
2016-04-28 11:28:46 -04:00 |
|
Oz Linden
|
f17d4edbe8
|
clean up terminology for jelly dolls / avatar complexity
|
2016-04-28 10:53:15 -04:00 |
|
Oz Linden
|
fab1381d60
|
shorted default time for complexity notices
|
2016-04-28 10:52:34 -04:00 |
|
Brad Payne (Vir Linden)
|
f3fb80c947
|
SL-344 - fixed a problem in avatar_lad with some params in wrong group, added diagnostics to make this easier to detect.
|
2016-04-27 17:19:09 -04:00 |
|
Brad Payne (Vir Linden)
|
d1a14cda34
|
SL-375 - pos = default pos threshold is now 0.1 mm
|
2016-04-27 14:39:30 -04:00 |
|
andreykproductengine
|
5ec93df56a
|
MAINT-438 UI/Color Settings opens non-functional "Debug Settings" floater when spawned before login
|
2016-04-27 20:54:21 +03:00 |
|
Mnikolenko Productengine
|
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 |