Commit Graph

1187 Commits (eb06fba7679704a7870e3d91f2166bf7e63e5641)

Author SHA1 Message Date
Ansariel 5351c445a8 Merge Firestorm LGPL 2016-11-29 19:26:31 +01:00
Ansariel 44f904b680 Sync with upstream 2016-11-26 19:57:12 +01:00
Ansariel 5a58635b64 Merge Firestorm LGPL 2016-11-16 16:11:56 +01:00
Ansariel 18dfdc2ae0 Merge bento-box 2016-11-11 16:00:37 +01:00
Brad Payne (Vir Linden) 5fb30e5ad3 MAINT-6913 - (Via Sovereign Engineer and Shyotl Kuhr) Pack the skinned matrix and translation into a single mat3x4 for optimal data transfer to reduce uniform slot usage. 2016-11-11 09:37:45 -05:00
Ansariel 42c77ab5bc Merge Firestorm LGPL 2016-11-04 12:52:13 +01:00
Ansariel 11b7af0c2a FIRE-20305: Fix GLSL compatibility in shaders, by Drake Arconis (Alchemy Viewer) 2016-11-29 15:00:27 +01:00
Ansariel f1011a1e19 Merge Firestorm LGPL 2016-10-11 21:08:24 +02:00
Ansariel a1023dd89c Merge viewer-bear 2016-10-10 22:19:33 +02:00
AndreyL ProductEngine 028fd67929 Crashfixes for image loading 2016-10-07 07:03:35 +03:00
AndreyL ProductEngine a14b9cb604 MAINT-6635 Fix for LLImageGL::setSize crash 2016-10-07 03:52:04 +03:00
Nicky 872b48d120 Merge. 2016-09-16 21:53:24 +02:00
Nicky fbb160b061 Cache results from FT_Get_Kerning for pairs of glyph < 256 to avoid costly FT_Get_Kerning calls. 2016-09-16 21:43:06 +02:00
Nat Goodspeed fe49126d45 MAINT-5011: Commit backing out BlockTimer warning suppression. 2016-09-06 20:42:27 -04:00
Nat Goodspeed bfb400ccd7 Backed out changeset c30d8774c404: remove warning suppression
for possibly-uninitialized data member in BlockTimer::BlockTimer.

NickyD suggested a real fix.
2016-09-06 20:41:23 -04:00
Nicky a6ba758356 Merge with phoenix-firestorm-lgpl 2016-09-07 01:22:08 +02:00
andreykproductengine 00fc34a62f MAINT-6683 fixed wrapping issues of notecard embedded items 2016-08-30 20:13:45 +03:00
andreykproductengine a00165aad4 MAINT-6683 fixed wrapping issues of notecard embedded items 2016-08-30 20:13:45 +03:00
Nat Goodspeed 6b24122857 Automated merge with ssh://bitbucket.org/lindenlab/viewer-vlc 2016-08-29 17:06:12 -04:00
Nat Goodspeed 20cf275d21 MAINT-5011: Work around gcc 4.7.2 overly (?) picky fatal warning. 2016-08-29 18:51:32 +00:00
Nicky b547aeef03 Merge with https://bitbucket.org/lindenlab/viewer-vlc 2016-08-01 16:15:47 +02:00
Nicky 0eb90922ce Merge. 2016-08-01 14:30:28 +02:00
ruslantproductengine eebbda288d Backed out changeset: 5fe5ad059c05 2016-07-18 20:09:18 +03:00
ruslantproductengine 0149e1912a MAINT-5018 crashing when touching mesh
Fix #1 Disable FSAA for drawing selected objects (it help to avoid crash on
old ATI cards (in my case it's a HD3800)).
2016-08-05 17:21:22 +03:00
Ansariel 1e49facc6c More VRAM detection logging 2016-07-25 18:51:41 +02:00
Nicky e982c273fd Merge with viewer-release-vlc 2016-05-29 19:27:00 +02:00
callum_linden 05fcb7c812 Automated merge with tip of viewer-release 2016-05-23 16:50:56 -07:00
ruslantproductengine 1b5af4be29 Add invert texture coordinates for media textures. 2016-05-13 18:47:23 +03:00
Ansariel a0188a5358 Merge Firestorm LGPL 2016-05-09 12:41:24 +02:00
Oz Linden 950c41d184 merge 4.0.4-release and MAINT-5974 2016-05-06 10:28:42 -04:00
Ansariel 706eb3b3de Merge Firestorm LGPL 2016-04-14 15:08:28 +02:00
Ansariel 10b73565f2 Merge viewer-bear 2016-04-14 15:07:39 +02:00
Ansariel e925c73ecc Merge Firestorm LGPL 2016-04-14 13:18:41 +02:00
ruslantproductengine 48016ff54b MAINT-6286 Viewer 4.0.3.312680 ignores settings for Shaders in Graphics Preferences for ATI Radeon HD 3800 Series graphics card 2016-04-12 19:29:35 +03:00
Ansariel 973965d5ec Use 64bit integers for texture memory 2016-03-31 11:18:11 +02:00
Ansariel d171e16c58 Merge Firestorm LGPL 2016-03-18 10:16:25 +01:00
Ansariel 1bba3dfbe4 Merge viewer-bear 2016-03-17 21:14:49 +01:00
Oz Linden 31f3db0291 merge changes for DRTVWR-417 2016-03-16 13:08:06 -04:00
ruslantproductengine 173886fec3 MAINT-1109 FIXED Toggling graphics options causes viewer memory to increase, eventually causing the rendering pipeline to fall over and crashing the viewer
Patchset #2
2016-03-10 19:50:12 +02:00
Ansariel 63c895fe62 Merge viewer-quickgraphics 2016-03-10 08:50:20 +01:00
Ansariel 3192fe832f Merge viewer-quickgraphics 2016-03-08 01:41:31 +01:00
Oz Linden 511bf30a2e make shader loading messages LL_DEBUGS 2016-03-07 15:40:39 -05:00
Ansariel 5bcab38d0a Backed out changeset 4bbf5275fe2e (Try to plug the profile icon memory hole) - This should be fixed now 2016-02-26 21:35:16 +01:00
Ansariel 51f8b1ec7b Merge viewer-bear 2016-02-26 21:34:32 +01:00
andreykproductengine 09cb792aa7 MAINT-5297 - icons were not removed from memory 2016-02-24 16:22:38 +02:00
Ansariel 063ec52083 Merge Firestorm LGPL tip 2016-02-13 13:43:08 +01:00
Ansariel e46ba2a706 Try to plug the profile icon memory hole 2016-02-13 11:26:38 +01:00
Ansariel db4492e92d Merge Firestorm LGPL 2016-02-02 22:39:27 +01:00
Nicky f2d1ad0b3b Remove ndfile, as the new apr can handle utf8 filenames on Windows. 2016-01-26 23:36:53 +01:00
Ansariel e7ade840e4 Merge viewer-bear 2016-01-24 14:00:30 +01:00