Commit Graph

40429 Commits (bd008a170898e69beeb8bc0481b4bfd94de86c55)

Author SHA1 Message Date
Mnikolenko ProductEngine 85d92553d8 MAINT-6447 In OS X El Capitan, display by a Gothic font is needed. 2016-05-31 17:32:05 +03:00
andreykproductengine f282c31f01 MAINT-2129 One more Block button 2016-05-31 16:56:45 +03:00
Mnikolenko Productengine 2b9927863f MAINT-6444 Outfits filter doesn't work in Outfit gallery 2016-05-30 15:03:40 +03:00
callum_linden 282956e768 Some simple tidy up and added a proper URL for video test button in web content floater 2016-05-27 16:53:16 -07:00
AndreyL ProductEngine 057c034cb4 Merged in lindenlab/viewer-lynx 2016-05-28 01:03:56 +03:00
AndreyL ProductEngine 0d5edb03a2 MAINT-6435 Deafult preset should set the same settings as the "Reset to recommended settings" button 2016-05-27 03:34:37 +03:00
Nicky ccfb18948d - Make popup appear on the right screen coordinates (this was broken after the flipy switch)
- Make sure the popup stays until it is dismissed (no need to hold the mouse button to scroll through eg a listbox) [This needs a CEF change.)
2016-05-27 00:27:10 +02:00
Callum Prentice 8c85ec13d5 Put back QuickTime plugin code for OS X until a LibVLC version is created 2016-05-26 13:51:22 -07:00
Callum Prentice 08b8e053f4 Fix typo in platform test for CEF version 2016-05-26 13:50:24 -07:00
callum_linden 70a38880fa Put back QuickTime plugin code for OS X only (untested - moving code to OS X dev) 2016-05-26 12:50:54 -07:00
Brad Payne (Vir Linden) b5f4eab65b SL-117, SL-315 - resetSkeleton() tweaks, additional validation of skeleton file 2016-05-26 12:52:09 -04:00
andreykproductengine 817ae34774 MAINT-6438 Add new alert to viewer for too much inventory in coalesced objects 2016-05-26 18:09:11 +03:00
andreykproductengine f3507631ea linux build fix 2016-05-26 18:26:43 +03:00
Brad Payne (Vir Linden) bda6285f1c merge 2016-05-26 08:57:50 -04:00
Brad Payne (Vir Linden) 7a7973c6a2 SL-315 - arche_tool.py updates, resetSkeleton() now preserves mPelvis state, forces all params to be updated. 2016-05-25 16:40:08 -04:00
andreykproductengine 7d54c62016 MAINT-6397 cut items should not go to trash 2016-05-25 20:37:52 +03:00
Mnikolenko Productengine 5b49f5c56e MAINT-6440 FIXED Inappropriate outfit is worn after clicking Wear button in Visual Outfit Browser 2016-05-25 18:52:57 +03:00
Glenn Glazer 67438c67ab pull from lynx 2016-05-25 08:12:47 -07:00
Glenn Glazer 9908fcf4ac Backed out changeset 9adcab4d611b 2016-05-25 07:51:58 -07:00
andreykproductengine 757414afb8 Updated contributions.txt 2016-05-25 17:20:13 +03:00
Brad Payne (Vir Linden) 806969c11c SL-315 - added arche_tool.py, a basic script for comparing 'Dump XML' output files 2016-05-25 09:40:45 -04:00
Mnikolenko Productengine fb598cd380 MAINT-2583 Minimized floaters cannot brought back to foreground anymore 2016-05-25 12:39:27 +03:00
AndreyL ProductEngine 110c0658b7 MAINT-6413 Buildfix 2016-05-25 03:47:23 +03:00
AndreyL ProductEngine 6f4d9a2321 MAINT-6424 Reverted disabling of the "Delete preset" button 2016-05-25 03:29:53 +03:00
Andrey Lihatskiy 238c1216c3 Merged in rider_linden/viewer-lynx (pull request #18)
MAINT-6403: Correct the local COF version from AIS when it loses sync.
2016-05-25 02:41:33 +03:00
Andrey Lihatskiy 00eda9e525 Merged in lindenlab/viewer-lynx-maint-6413 (pull request #16) 2016-05-25 02:40:48 +03:00
Glenn Glazer 650df5b2e9 merge from maint-6413 into lynx for pull request 2016-05-24 14:50:01 -07:00
Rider Linden 9ea13d49b7 Merge 2016-05-24 14:32:06 -07:00
Rider Linden 26b1c020c8 MAINT-6403: Updated a couple comments and dropped a couple warning levels back down to DEBUG. 2016-05-24 13:03:36 -07:00
AndreyL ProductEngine 0318e36167 MAINT-6419 Simplified the version check + buildfix 2016-05-24 21:59:58 +03:00
Glenn Glazer ce760e80c4 MAINT-6413: write summary.json from viewer_manifest.py, remove facility from cmake 2016-05-24 11:43:57 -07:00
pavelkproductengine 4d9b3cd725 Merge VOB with release 4.0.6 2016-05-24 18:37:20 +03:00
ruslantproductengine 67f8d57927 MAINT-6216 avatars are sometimes invisible
BUG-10330 Sitting avatars are sometimes invisible
2016-05-24 15:17:41 +03:00
callum_linden 05fcb7c812 Automated merge with tip of viewer-release 2016-05-23 16:50:56 -07:00
Rider Linden c7413e51b6 MAINT-6403: in the case of a version mismatch between the viewer's local accounting and the AIS reported. Override with the AIS version. simplify the appearance update code to account for new versioning. Fix spelling of descendant 2016-05-23 14:40:43 -07:00
Glenn Glazer 999a949b52 debug version args 2016-05-23 13:49:26 -07:00
Glenn Glazer 9c28c06f1d backout 354346 / e63c00cf654a and 354347 / e4bfe3ee05a6 2016-05-23 12:08:59 -07:00
Glenn Glazer 8c45877871 backout 354345 2016-05-23 12:05:53 -07:00
Andrey Lihatskiy 380bbc01c9 Merged in andreyl_productengine/viewer-lion-marchcat (pull request #42)
MAINT-6424 Disable the delete button for empty graphics presets list
2016-05-23 20:45:24 +03:00
Glenn Glazer c68def40b1 debug print statement to be removed later 2016-05-23 10:31:09 -07:00
Mnikolenko Productengine addbfaf1c7 MAINT-6431 Trash button is not functional in in Visual Outfit Browser 2016-05-23 17:07:48 +03:00
AndreyL ProductEngine 8edfdc617d MAINT-6424 Disable the delete button for empty graphics presets list
Fixed related notifications after improper merge as well
2016-05-23 02:23:03 +03:00
Brad Payne (Vir Linden) 3c0ea13669 SL-344 - provisional slider fixes 2016-05-22 19:03:11 -04:00
Ansariel 61a5c943ba MAINT-6432 Fix defaults for RenderAvatarMaxComplexity
The 'all' section must be set to the value for high end machines as the minimum of high-end and recommended setting will be applied
2016-05-22 20:32:27 +02:00
Brad Payne (Vir Linden) f47ceb47bb merged jelly-doll viewer-release into bento 2016-05-21 08:15:28 -04:00
AndreyL ProductEngine 602c9bc04a MAINT-6317 Restored the fix after a conflict resolution 2016-05-20 02:12:26 +03:00
AndreyL ProductEngine c50f96b492 Merged in lindenlab/viewer-lynx 2016-05-20 02:06:08 +03:00
AndreyL ProductEngine 357f6d04ed MAINT-6419 Show the release notes when first starting a new viewer 2016-05-20 01:45:12 +03:00
AndreyL ProductEngine 445cd96293 Merged in lindenlab/viewer-release 2016-05-20 00:03:30 +03:00
AndreyL ProductEngine b25a22a2c1 Merged in lindenlab/viewer-release 2016-05-19 23:02:37 +03:00