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

13 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 4fc7a221e1 Disable uniform map checking for now (breaks on several valid edge cases). 2010-10-12 17:04:41 -05:00
Dave Parks 21b1b91c44 ATI compatibility pass 2010-10-06 12:53:26 -05:00
Dave Parks 62943202a7 Make rigged attachments respect under water rendering. 
Reviewed by Nyx.
 2010-08-13 14:42:07 -05:00
Dave Parks f324787a70 Rigged attachment integration WIP. 2010-05-01 00:45:44 -05:00
Dave Parks 47ffcdb93d Rigged attachments (almost works). 2010-04-06 16:24:08 -05:00
Tofu Linden 22ccfab764 CID-295 
Checker: UNINIT_CTOR
Function: LLGLSLShader::LLGLSLShader()
File: /indra/llrender/llglslshader.cpp

--HG--
branch : product-engine
 2010-02-03 17:57:47 +00:00
Steven Bennetts 9ec432034d merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 
ignore-dead-branch
 2009-06-21 08:04:56 +00:00
Adam Moss b01c75cb42 svn merge -r117314:117337 
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1

QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge
 2009-04-16 23:45:35 +00:00
Brad Kittenbrink abdc99f21b Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render-9) and QAR-1236 (dll-msvcrt-2) 
svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833
 2009-02-18 21:10:16 +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