Commit Graph

1128 Commits (d63d3b4e7b3f70287cdbdb96c5a42f213b1c07ae)

Author SHA1 Message Date
Ansariel a0188a5358 Merge Firestorm LGPL 2016-05-09 12:41:24 +02:00
Ansariel 2fc4562c9f Merge viewer-bear 2016-04-23 11:52:26 +02:00
Cinder Biscuits a07897bf9c contributions.txt edited online with Bitbucket 2016-04-21 01:27:52 +00:00
Ansariel 14954d999d Merge viewer-quickgraphics 2016-03-31 18:54:45 +02:00
Oz Linden c3fd3b41e8 add contribution for MAINT-6218 (alpha-ed avatar showing) 2016-03-23 14:38:38 -04:00
Ansariel d171e16c58 Merge Firestorm LGPL 2016-03-18 10:16:25 +01:00
Oz Linden 31f3db0291 merge changes for DRTVWR-417 2016-03-16 13:08:06 -04:00
Ansariel faf58a81eb Merge viewer-bear 2016-03-08 09:08:20 +01:00
Ansariel 3192fe832f Merge viewer-quickgraphics 2016-03-08 01:41:31 +01:00
Oz Linden 5822fb00b6 merge DRTVWR-398 build cleanup fixes 2016-03-07 12:41:11 -05:00
andreykproductengine f4e3306517 Updated contributors.txt 2016-02-29 18:09:25 +02:00
Ansariel bc48a22db8 Merge Firestorm LGPL 2016-02-26 13:15:13 +01:00
Ansariel 0a741843ca Merge viewer-bear 2016-02-21 02:35:15 +01:00
AndreyL ProductEngine f5c133712b Updated contributors.txt 2016-02-21 00:43:35 +02:00
Ansariel a0fa2e5762 Merge viewer-bear 2016-02-19 10:30:02 +01:00
AndreyL ProductEngine d8f7a40dea Added newly created tickets for Kitty's fixes to contributors.txt 2016-02-19 04:05:09 +02:00
AndreyL ProductEngine 3e56ba7d6c Updated contributors.txt 2016-02-19 00:22:06 +02:00
Ansariel 51909c8efa Merge Firestorm LGPL 2016-02-15 10:31:04 +01:00
Ansariel 79dcb1ca11 STORM-2124 - Update fonts.xml with default CJK font collections in OS X 10.11 and Windows 10; by Cinder Roxley, with modifications for Firestorm 2016-02-13 20:42:13 +01:00
Oz Linden 4fd57774dd OPEN-297 simplify build number generation 2016-02-07 14:58:47 -08:00
Oz Linden 867ef882fd merge changes for OPEN-292 2016-02-07 13:41:41 -08:00
Ansariel e7ade840e4 Merge viewer-bear 2016-01-24 14:00:30 +01:00
Ansariel 354812cc68 Merge Firestorm LGPL 2016-01-16 19:10:08 +01:00
Oz Linden bc22e58743 merge changes for 4.0.1-release 2016-01-15 16:55:04 -05:00
Mnikolenko ProductEngine 77156c2b15 MAINT-1392 HUD objects Behave Badly in conjunction with the Mouse Scroll Wheel 2016-01-05 13:23:34 +02:00
Cinder Biscuits cc235cdcc4 Merged lindenlab/viewer-tools-update into default 2015-11-29 20:14:22 -07:00
Oz Linden 9848fc4253 merge changes for 4.0.1-release 2016-01-15 17:01:16 -05:00
Ansariel 68739bc569 Merge Viewer-Bear 2015-10-27 01:31:15 +01:00
Ansariel 4a187aec4e MAINT-5756: Unicode characters in online notifications get stripped 2015-10-16 11:28:53 +02:00
Ansariel 83862ed91a Merge Firestorm tip 2015-10-15 11:02:30 +02:00
Oz Linden 69ff937e47 merge changes for 3.8.5-release 2015-10-13 08:43:03 -04:00
Oz Linden d17614ca61 merge changes for 3.8.5-release 2015-10-12 15:24:56 -04:00
Ansariel 5524d38dff Merge viewer-quickgraphics 2015-10-03 16:38:26 +02:00
AndreyL ProductEngine 67757ddd5b MAINT-5416 FIXED Cannot right-click a rigged mesh that's worn
--HG--
branch : maint-5416
2015-09-04 21:06:22 +03:00
Ansariel 3cd1736f3d Merge viewer-bear 2015-08-29 11:47:44 +02:00
AndreyL ProductEngine 9c391b3dea MAINT-5533 FIXED The fragment part of an URI is only shown if it contains a query part as well.
fix by Ansariel
2015-08-20 12:04:57 +03:00
Oz Linden 71a468c6fb merge changes for other open sourc contributions 2015-07-30 11:09:00 -04:00
AndreyL ProductEngine 57904b4def MAINT-5416 Reverted changeset: 9bd24c17d908 2015-07-23 23:59:05 +03:00
AndreyL ProductEngine 269cc894a9 MAINT-5416 FIXED cannot right-click a rigged mesh that's worn 2015-07-17 07:31:36 +03:00
Oz Linden 828f89f3a7 correct labels for rendering choices for STORM-2107 2015-06-30 16:46:49 -04:00
Oz Linden aa630cac08 merge buildcleanup 2015-06-25 12:13:10 -04:00
Oz Linden 95fc2d48ec merge changes for 3.7.30-release 2015-06-15 15:53:45 -04:00
Cinder 5a282abe18 STORM-2113 - uri parsing cleanup and fixes 2015-04-11 15:23:06 -06:00
Oz Linden 7a212eb7e5 merge changes for tools update tip 2015-03-26 10:53:53 -04:00
Cinder Biscuits ab30a44d9d Add Cinder Roxley as contributor for BUG-8835 2015-03-25 03:09:17 +00:00
Oz Linden d6f7a16a68 merge changes for 3.7.26-release 2015-03-23 22:39:18 -04:00
Ansariel 06bc6d14d2 Add myself to contributions list 2015-05-21 11:14:14 +02:00
Cinder 045779c802 STORM-2105 - Introduct EMBED_MANIFEST cmake macro for Windows and embed in the exes 2015-05-20 22:45:15 -06:00
Nicky 006190f2a1 Merge with tools update. 2015-05-05 13:09:27 +02:00
Oz Linden 83851db09a merge up to 3.7.25-release 2015-02-27 09:03:04 -05:00