10 Commits (e69aa18c0dfbef2fa3bbefeba08fa1c258c69fb3)

Author	SHA1	Message	Date
Oz Linden	a5619d16f7	correct licenses (fix problem with license change merge)	2010-10-13 07:24:37 -04:00
Dave Parks	9d5a3d7a2d	Better support for curious mixtures fullbright/shiny/water with rigged attachments, deferred rendering, and not.	2010-08-13 19:35:03 -05:00
Dave Parks	95ca4315e3	Fix for stupid shader loading mistake.	2010-04-23 00:38:10 -05:00
Dave Parks	5715a9269b	Fix for broken shader loading behavior when Debug GL enabled.	2010-04-22 23:16:39 -05:00
Dave Parks	54dd30cc42	More rigged attachments work.	2010-04-15 00:04:17 -05:00
Dave Parks	47ffcdb93d	Rigged attachments (almost works).	2010-04-06 16:24:08 -05:00
Adam Moss	e188badaf2	QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergeme ... svn merge -r108355:109316 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/maint-viewer-12-uploadfees-qa108314 Whew.	2009-02-03 17:56:26 +00:00
Aaron Brashears	e3cf284388	Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165	2009-01-08 00:05:06 +00:00
Mark Palange	f89f19990c	QAR-992 Merging revisions 101012-101170,101686-101687 of svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into linden/release	2008-11-07 17:51:03 +00:00
Eric Tulla	939a506569	Merging in file-move-merge ( QAR-649 ) ... Result of "svn merge -r 90669:90786 $tulla/file-move-merge ." Be careful of future merges involving changes to any of these moved files as SVN usually does the wrong thing: newview/llglslshader.* -> llrender/llglslshader.*, llrender/llshadermgr.*, newview/llviewershadermgr.* (gets split into 3 separate files) newview/llpostprocess.* -> llrender/llpostprocess.* newview/llrendersphere.* -> llrender/llrendersphere.* newview/llcubemap.* -> llrender/llcubemap.* llwindow/llgl.* -> llrender/llgl.* llwindow/llglstates.h -> llrender/llglstates.h llwindow/llgltypes.h -> llrender/llgltypes.h llwindow/llglheaders.h -> llrender/llglheaders.h	2008-06-30 17:57:00 +00:00