Commit Graph

129 Commits (434f0e161aa7b378ff16d526e104e580ba367ab2)

Author SHA1 Message Date
Nat Goodspeed 434f0e161a Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2017-02-03 09:54:52 -05:00
Callum Prentice 067468885a BUG-41027 (FIX) Changing login location at the login screen crashes the viewer 2016-12-15 10:58:23 -08:00
andreykproductengine 3c9181867f MAINT-6905 reducing log spam 2016-11-04 16:18:35 +02:00
Nicky c4e21cf282 Fix a crash is drawn vertices is 0.
(transplanted from 89b3e585218ddb8d6a3e62af29f8daf889371e5e)
2016-04-24 12:55:13 +02:00
ruslantproductengine eebbda288d Backed out changeset: 5fe5ad059c05 2016-07-18 20:09:18 +03: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
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
ruslantproductengine 29bdf1a234 MAINT-4839 FIXED Animation of Mesh Dress doesn't work.
MAINT-4165 FIXED Crash on skinned, texture animated geometry with deferred rendering enabled.
2015-03-01 14:10:54 +02:00
ruslantproductengine 799d13269a MAINT-3585 FIXED Viewer Crashes when attempting to upload image.
The bug was fixed, the reasone of crash is following. The Core Flow view
contain another GL context and will not care about restoring a previous.
I restore context manually.
This path also contain a minor changes in another files.

All changes described here.

Сhange's for fix current bug.
indra/llwindow/llwindow.h
indra/llwindow/llwindowheadless.h
indra/llwindow/llwindowmacosx.h
indra/llwindow/llwindowsdl.h
indra/llwindow/llwindowwin32.h
indra/newview/lllocalbitmaps.cpp
indra/newview/llviewerdisplay.cpp
indra/newview/llviewerdisplay.h

Twice mUsage initialization (replace to forward initialization).
indra/llcharacter/lljointstate.h

Looks like condition should be befor memcopy call, otherwise - possible CRASH.
indra/llcommon/llmd5.cpp

Unused condition and variables.
indra/llmath/llsphere.cpp

Looks like should be under if otherwise - possible CRASH
indra\llprimitive\llmodel.cpp

Useless assert's.
indra/llrender/llrender.cpp
indra/newview/lldaycyclemanager.cpp
2014-11-03 20:05:20 +02:00
ruslantproductengine d47efdfe03 MAINT-3964 FIXED Textures with Alpha won't Animate on Rigged Mesh when worn : fix in shader (mul texcoord to tex matrix), array's optimization 2014-09-10 21:08:08 +03:00
Richard Linden 5b846ed2a6 merge with release 2014-03-12 12:48:43 -07:00
Mnikolenko ProductEngine dfa6822b34 MAINT-3359 Don't check for LLGLSLShader::sNoFixedFunction as we don't want to loose ui colours(depending on enabled/disabled basic shader). 2013-10-30 14:26:11 +02:00
Richard Linden 80dfbbaacd merge from viewer-release 2013-10-08 11:59:24 -07:00
Richard Linden 59628d6f85 Automated merge with http://bitbucket.org/lindenlab/viewer-release 2013-10-01 14:28:39 -07:00
Graham Linden 71e986b059 NORSPEC-285 fix merge error with attenuation on alpha masquerading as this norspec from wayback 2013-09-23 14:49:10 -07:00
Graham Linden 95e34d86b9 The unbearable lightness of being norspec 2013-09-18 18:24:16 -07:00
Dave Parks 0ab4e11223 Fix for random bad colors in UI on Intel HD 4000 2013-10-08 14:43:10 -05:00
Richard Linden e340009fc5 second phase summer cleaning
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
Dave Parks d6d2f74fbb NORSPEC-290 Shader optimization WIP -- compatibility pass with OpenGL 3.3, slight cleanup. 2013-07-01 16:27:20 -05:00
Dave Parks 7df863265f NORSPEC-290 Shader optimization WIP -- remove a couple normalizes, pows, and divides from various lighting functions. 2013-06-28 13:32:01 -05:00
Dave Parks 380785e613 Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials 2013-06-27 16:16:56 -05:00
Graham Linden c603eb5ece MAINT-318 prevent crashes from incomplete quads and lines and prevent drivers from crashing to desktop when passed short buffers 2013-06-17 08:03:32 -07:00
Richard Linden 0a96b47663 merge with viewer-release 2013-06-05 19:05:43 -07:00
simon ee2fce8790 Merge downstream code and viewer-beta 2013-05-09 14:10:45 -07:00
Xiaohong Bao c978364e1e for SH-4133: create a debug tool to show textures in active fetching 2013-04-22 22:11:41 -06:00
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
simon b42b789723 Merge in downstream code (chui fixes, materials) 2013-04-11 16:18:34 -07:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Dave Parks 586025bde5 Automated merge with https://bitbucket.org/lindenlab/viewer-cat 2013-03-04 18:06:29 -06:00
Dave Parks 609ed855e1 MAINT-2371 More optimizations.
Reviewed by Graham
2013-03-04 18:01:42 -06:00
Graham Madarasz (Graham) 4e81a84abd Performance improvements. Faster threadsaferefcount, faster instancetracker, use hashtable and pre-hashed strings for GLSL uniform lookup, and use dup_handles curl interface to avoid re-initing ares resolvers expensively. 2013-03-04 08:57:58 -08:00
Dave Parks f5e5396c3a MAINT-2371 First set of profile guided optimizations.
Reviewed by Graham
2013-02-26 15:15:08 -06:00
Graham Madarasz (Graham Linden) 2fd0e6e8f9 Merge viewer-cat and resolve conflict with alternate self 2013-02-21 16:50:04 -08:00
Dave Parks f67087b872 MAINT-2370 Add debug setting "RenderAutoMuteRenderCostLimit" that automatically visually mutes avatars above a certain threshold (adjusted by Avatar Mesh Detail Slider) 2013-02-20 19:30:46 -06:00
Nyx Linden 49caededb4 BUILDFIX: enabling the building of the viewer/appearance backend with headless mesa 2012-09-19 17:05:56 +00:00
Dave Parks d1c056beba MAINT-685 Fix for disabling basic shaders making high detail terrain render incorrectly. 2012-07-03 14:35:08 -05:00
Dave Parks bedbbf7c02 Merge 2012-06-28 16:32:54 -05:00
Dave Parks e3a5125b41 MAINT-616 Potential fix for corrupted mip maps. 2012-05-25 17:58:12 -05:00
Brad Payne (Vir Linden) 7b3f721e7a SH-3018 WIP - removed audit texture, other unused diagnostic code 2012-02-29 16:15:02 -05:00
Dave Parks 1de63bec50 MAINT-861 Fix for crash on exit due to bad matrix mode 2012-04-13 15:47:44 -05:00
Brad Payne (Vir Linden) 34408bed26 merge 2012-02-01 15:43:11 -05:00
Dave Parks e02f007d20 SH-1427 Fix for spot lights not working properly on alpha objects, and fix for alpha lighting of point lights not matching deferred lights. 2012-01-24 12:59:18 -06:00
Xiaohong Bao 05cff1ad7f fix for SH-2827: [crashhunters] Crash in LLPipeline::generateWaterReflection() 2012-01-18 15:26:30 -07:00
Xiaohong Bao 837e38d819 trivial: debug code for SH-2827: [crashhunters] Crash in LLPipeline::generateWaterReflection() 2012-01-05 21:26:35 -07:00
Dave Parks 45d3e147ac SH-1912 Add environment map back into shiny when lighting and shadows enabled. 2011-11-29 17:13:11 -06:00
Dave Parks b2824aa21d SH-2690 Add comments per Vir's review feedback 2011-11-16 15:25:09 -06:00
Dave Parks 986dccbeaf SH-2690 Fix for spammy triangle death on GeForce 7800 Go when selecting flexi attachments. 2011-11-16 15:08:17 -06:00
Dave Parks 969aa248a4 SH-2633 Fix for avatar hair turning white when editing appearance 2011-10-28 16:26:20 -05:00
Dave Parks 3211c6e308 SH-2240 WIP on removing lots of string comparisons that were added to deal with exploding amounts of non-built-in GL state 2011-10-11 00:26:03 -05:00