Commit Graph

40429 Commits (bd008a170898e69beeb8bc0481b4bfd94de86c55)

Author SHA1 Message Date
andreykproductengine 183cc7cdfd MAINT-6860 Appearance floater crash due to missnamed variable 2016-10-21 16:59:02 +03:00
Ruslan Teliuk 0ac937200b Merged in ruslantproductengine/viewer-neko-ruslant-4-cr (pull request #60)
MAINT-5018 crashing when touching mesh
2016-10-20 16:50:35 +00:00
andreykproductengine 10f7847c8b MAINT-6830 Newly created & renamed favorite landmarks were displaying old name 2016-10-20 17:04:22 +03:00
Mnikolenko Productengine 5d1f6223eb MAINT-6835 Material of model is not a subset of reference, cause upload model dialog to stick with error 2016-10-20 16:15:36 +03:00
Brad Payne (Vir Linden) 0200135224 merge 2016-10-18 16:59:15 -04:00
Brad Payne (Vir Linden) 8230a9937f MAINT-6841 - removed the joint remapping code, since it was designed to support a feature we no longer have. This also incidentally fixes any bugs caused by the joint remapping code. 2016-10-18 16:05:35 -04:00
Oz Linden 8e30a2f06d merge changes for 4.1.1-release 2016-10-18 15:38:33 -04:00
andreykproductengine 6b1f96187d MAINT-6793 Rigged mesh sometimes full of holes 2016-10-18 15:32:01 +03:00
andreykproductengine 9564600206 MAINT-6487 Decreasing delay 2016-10-18 19:57:19 +03:00
Mnikolenko Productengine fceaa9ddf1 MAINT-6817 crash when uploading a mesh if Include skin weights checkbox is clicked before preview appears. 2016-10-18 11:09:13 +03:00
Rider Linden 877c01f3f2 Merged lindenlab/viewer-bear into default 2016-10-17 15:57:03 -07:00
Rider Linden 826afcaf38 Merge 2016-10-17 15:48:14 -07:00
Rider Linden 391ae4dee4 MAINT-6837: forced sit error messages. 2016-10-17 15:44:40 -07:00
andreykproductengine 881fe0a117 Restored MAINT-4488 (perviosly reverted in MAINT-6242) 2016-10-18 01:29:27 +03:00
Rider Linden 38d06dcce6 Merged lindenlab/viewer-release into default 2016-10-17 14:58:29 -07:00
andreykproductengine c50cb47f1b Backed out changeset: 4df419cb7b2f 2016-10-17 22:27:20 +03:00
andreykproductengine e2224a5d8e MAINT-6833 HUD warning will no longer show for temp attached objects 2016-10-17 19:04:11 +03:00
Andrey Kleshchev c86967100c Merged in MAINT-6487 2016-10-17 15:27:38 +00:00
AndreyL ProductEngine 2540868bf3 MAINT-6831 Fix rtsp mime type should be opened with vlc 2016-10-15 00:44:49 +03:00
andreykproductengine 759b4f14d8 MAINT-6828 Removed unnessesary spam in logs 2016-10-13 22:49:06 +03:00
AndreyL ProductEngine 740159f004 Merged in lindenlab/viewer-bear 2016-10-15 07:08:22 +03:00
Nat Goodspeed c52f621e20 MAINT-5232: Use LLHeteroMap for LLUICtrlFactory::ParamDefaults objs
instead of making every ParamDefaults specialization an LLSingleton in its own
right.
2016-10-13 08:11:51 -04:00
Nat Goodspeed 23d50f53cb MAINT-5232: Ensure custom operator<<() overload is visible to TUT. 2016-10-13 07:11:18 -04:00
Nat Goodspeed 763509589d MAINT-5232: Add LLHeteroMap to contain objects of unrelated classes. 2016-10-12 23:01:48 -04:00
andreykproductengine b98bc258f2 MAINT-6487 Viewer Objects should not queue too many downloads 2016-10-12 20:18:05 +03:00
Mnikolenko Productengine c00065a205 MAINT-6813 Opening Preferences floater takes too much time to open on login screen on some machines 2016-10-12 16:48:27 +03:00
Andrey Lihatskiy 67c24d933b Merged in lindenlab/viewer-bear-maint-6633 (pull request #23)
Default
2016-10-12 10:47:26 +00:00
Glenn Glazer 86be29fe80 merge maint-6633 to fork of viewer-bear 2016-10-11 14:42:58 -07:00
Glenn Glazer d68befaced maint-6633: remove commented out code 2016-10-11 13:28:30 -07:00
Glenn Glazer 19f576872a maint-6633: space, the final frontier 2016-10-11 11:41:25 -07:00
Glenn Glazer e6043fad2a maint-6633: space after colon 2016-10-11 09:21:33 -07:00
Glenn Glazer f447cf7223 maint-6633: yet more futzing with spaces 2016-10-11 08:16:25 -07:00
andreykproductengine 791b0de262 MAINT-6790 Fixing log spam 2016-10-11 18:16:11 +03:00
Nat Goodspeed 704c53b3c5 MAINT-5232: Merge up to VLC viewer from viewer-release 2016-10-11 10:59:17 -04:00
Ruslan Teliuk a47896f4b9 Merged lindenlab/viewer-neko into default 2016-10-11 16:21:01 +03:00
Andrey Kleshchev 061b918dee Merged in MAINT-6792 (pull request #22) 2016-10-11 16:06:04 +03:00
Mnikolenko Productengine 71661a0266 MAINT-6811 remove Autopilot cancelled notification 2016-10-11 14:15:21 +03:00
Mnikolenko Productengine f5fcf54cd9 MAINT-6811 remove Autopilot cancelled notification 2016-10-11 14:15:21 +03:00
Mnikolenko Productengine aaf935267d MAINT-6600 FIXED Mac Viewer Does Not Handle Bad Arguments Gracefully 2016-10-11 13:16:03 +03:00
Glenn Glazer 0a55b1d022 maint-6633: more futzing with spaces 2016-10-10 19:27:12 -07:00
Glenn Glazer 22ac9a10d8 maint-6633: fix spacing after level: 2016-10-10 16:03:10 -07:00
AndreyL ProductEngine 0f1d13fd4a Merged in lindenlab/viewer-bear 2016-10-11 01:21:12 +03:00
Glenn Glazer cea2e4a7ad maint-6633: fix spacing 2016-10-10 15:14:46 -07:00
Glenn Glazer acfbcc7352 maint-6633: move INFO around 2016-10-10 14:15:29 -07:00
Glenn Glazer c39b7f2d88 maint-6633: fix tyop 2016-10-10 13:37:42 -07:00
AndreyL ProductEngine 4617e07b37 Merged in lindenlab/viewer-release 2016-10-10 23:26:58 +03:00
Oz Linden 086c134215 increment viewer version to 4.1.2 2016-10-10 15:33:44 -04:00
Oz Linden 662cae23f6 Added tag 4.1.1-release for changeset b280a1c797a3 2016-10-10 15:33:44 -04:00
Glenn Glazer 972b0b2f1b maint-6633: fix unit test to conform with new desired ordering 2016-10-10 12:31:01 -07:00
Glenn Glazer 64ab1979db maint-6633: fix ordering of log entries 2016-10-10 10:50:22 -07:00