livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
47,613 Commits
2 Branches
0 Tags
301 MiB
Commit Graph

1133 Commits (19c9bbae355dcacbbcd78eebd6604dfd83006a73)

Author SHA1 Message Date
Ansariel 68739bc569 Merge Viewer-Bear 2015-10-27 01:31:15 +01:00
ruslantproductengine 4f8f739a98 MAINT-3568 Mac OS X, ALM, Full Bright, Shininess 
The reason of this bug the same as was in MAINT-4165, MAINT-4839.
I.e. in short: SL engine is sensitive to the uniform variable location.
 2015-10-02 19:25:05 +03:00
Nicky d693d7247c Remove obsolete files. 2015-08-19 21:21:06 +02:00
Ansariel 5b846a91cf Merge Firestorm tip 2015-07-18 16:37:52 +02:00
Ansariel d2c3f41e1e Crash fix due to invalid calls to drawElements by Drake Arconis 2015-07-17 12:08:09 +02:00
Ansariel a45d3d8421 Merge Viewer-Bear 2015-06-20 15:35:15 +02:00
Mnikolenko ProductEngine 89321a56fd increment viewer version to 3.7.29 2015-04-28 12:03:31 +03:00
Mnikolenko ProductEngine bb87365c37 Merge viewer-release, become version 3.7.29 2015-04-28 13:36:35 +03:00
Oz Linden a8ef252571 merge changes for 3.7.27-release 2015-04-13 16:23:36 -04:00
Oz Linden 5c6cf3e7fb restore the ll[io]fstream because we need them as wrappers on Windows for wide char paths; on other platforms they are now just typedefs to the std classes 2015-04-10 11:02:37 -04:00
Oz Linden 8b42c7898e replace llifstream and llofstream with std::ifstream and std::ofstream respectively 2015-04-07 17:59:28 -04: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
Nicky de69b11387 Merge. 2015-05-07 23:22:44 +02:00
Ansariel c78bd2aa1e Backout 4cf3dd03650a for the time being as we currently do not need it 2015-05-06 09:22:26 +02:00
Nicky 006190f2a1 Merge with tools update. 2015-05-05 13:09:27 +02:00
Ansariel 980ac325ca FIRE-15947: Setting texmem to 1GB causes bias going up to 5 2015-04-26 20:16:55 +02:00
Oz Linden 6f3cf79a3a merge changes for 3.7.24-release 2015-01-13 13:46:45 -05:00
Oz Linden dab5acd972 merge changes for 3.7.22-release 2014-12-15 12:34:18 -05:00
callum_linden 23711c9275 Rename llround(..) to ll_round(..) because of a collision with MS llround (long long round) in VS2013 2014-12-10 08:44:08 -08:00
Brad Payne (Vir Linden) 7e962d3798 merge 2014-12-08 13:01:44 -05:00
simon c3e18bc537 Merge downstream code and become version 3.7.23 2014-12-08 11:52:17 -08:00
Brad Payne (Vir Linden) 6cffbfba8b merge 2014-12-02 14:48:45 -05:00
Brad Payne (Vir Linden) fe5ff3e74a merge 2014-12-01 16:21:52 -05:00
Oz Linden 0013a50353 merge changes for 3.7.21 release 2014-12-01 15:49:31 -05:00
simon fa068dffd0 Merge downstream code and become version 3.7.21 2014-11-24 11:31:06 -08:00
Graham Linden a882d7a02b Fix for gpu_bench crash without parallels knock-on 2014-11-18 12:54:13 -08:00
Graham Linden de2fe42a52 Attempt wider disable of using profile API when timer query is not present 2014-11-17 14:54:00 -08:00
Graham Linden 9eeb8344a6 Avoid using GL_ARB_timer_query functionality when not supported and protect against probably-not-NULL current bound shader pointer 2014-11-17 11:40:28 -08:00
Nat Goodspeed 6be2f0ba2b Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2014-11-14 08:49:08 -05:00
maksymsproductengine fa9097b65f Merge changes for 3.7.20-release 2014-11-11 02:32:39 +02:00
Oz Linden b66c719060 merge changes for 3.7.20-release 2014-11-10 14:43:05 -05: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
callum_linden 2c78c1935f Update to build on Xcode 6.0: more removal of unused variables [-Wunused-variable] 2014-10-17 15:45:18 -07:00
Oz Linden 7ffa456683 STORM-2080: correct fitted mesh rendering on some ATI cards 2014-10-14 11:22:39 -04:00
JJ Linden 5cb5c267ca fixes for cmake warnings about policy changes. could not fully test these changes 2014-10-13 12:46:55 -07:00
ruslantproductengine b008385a50 FIRE-12732/MAINT-3585 FIXED Viewer Crashes when attempting to upload image 
on OS X.
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.

Change'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
Liny 1ee6b83b10 Proper fix for intel shder compiler log spam. 2015-02-26 09:58:34 -08:00
Liny 37d47ffbf0 Fix intel GLSL compiler spitting out "No errors." instead of an empty string like others do when there are no errors, causing log spam. 2015-02-25 23:54:22 -08:00
Ansariel e52d57cba2 Merge LL V3.7.23 2015-01-15 15:44:43 +01:00
Ansariel 824bdebd79 Merge LL V3.7.22 2015-01-15 14:17:42 +01:00
Ansariel 99cbf150a0 Merge LL V3.7.21 2015-01-15 13:55:17 +01:00
Ansariel 992ebe2c63 Remove Nicky's AMD fix - will be replaced by the V3 version 2015-01-15 13:16:21 +01:00
Tank_Master 93c0ece928 Merge LL v3.7.20 2015-01-15 01:17:02 -08:00
Tank_Master c3466ac315 Backed out changeset: 6e3af080d67a - benchmark code (prep for later mergeing) 2015-01-10 09:43:21 -08:00
Ansariel e1ce6e3d58 Merge Firestorm LGPL tip 2015-01-08 23:12:58 +01:00
Nicky bb0329d012 Add debug floater to show how much texture memory objects in view use (per object). 2015-01-07 01:34:44 +01:00
Ansariel f4bfb1aadf Merge LL V3.7.9 (AIS3 + SSA) 2014-10-22 02:02:08 +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
Dave Parks d0428575fb Automated merge with http://bitbucket.org/lindenlab/viewer-release 2014-06-19 13:14:42 -05:00
Stinson Linden 8392fde6f6 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-drtvwr-365. 2014-06-02 22:32:16 +01:00