livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
phoenix-firestorm/indra/llrender
History
Monroe Williams 745845f799 svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910 
svn merge -r 129913:131718 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05

Some branch shenannigans in the pluginapi_05 branch caused this to become a two-part merge.
 		2009-08-27 19:00:18 +00:00
..
CMakeLists.txt Merged skinning-17 into viewer-2 for bug fixes. Commented out new IM window for now, not complete. 2009-07-27 17:56:26 +00:00
llcubemap.cpp Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render-9) and QAR-1236 (dll-msvcrt-2) 2009-02-18 21:10:16 +00:00
llcubemap.h 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
llfontbitmapcache.cpp merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
llfontbitmapcache.h Merged skinning-17 into viewer-2 for bug fixes. Commented out new IM window for now, not complete. 2009-07-27 17:56:26 +00:00
llfontfreetype.cpp merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3 2009-08-24 20:04:52 +00:00
llfontfreetype.h Merged skinning-17 into viewer-2 for bug fixes. Commented out new IM window for now, not complete. 2009-07-27 17:56:26 +00:00
llfontgl.cpp merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3 2009-08-24 20:04:52 +00:00
llfontgl.h merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3 2009-08-24 20:04:52 +00:00
llfontregistry.cpp merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3 2009-08-24 20:04:52 +00:00
llfontregistry.h Merged skinning-17 into viewer-2 for bug fixes. Commented out new IM window for now, not complete. 2009-07-27 17:56:26 +00:00
llgl.cpp merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
llgl.h merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
llgldbg.cpp 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
llgldbg.h 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
llglheaders.h svn merge -r113780:113785 2009-03-09 23:42:07 +00:00
llglslshader.cpp merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
llglslshader.h Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render-9) and QAR-1236 (dll-msvcrt-2) 2009-02-18 21:10:16 +00:00
llglstates.h 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
llgltypes.h 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
llimagegl.cpp svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910 2009-08-27 19:00:18 +00:00
llimagegl.h svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910 2009-08-27 19:00:18 +00:00
llpostprocess.cpp Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render-9) and QAR-1236 (dll-msvcrt-2) 2009-02-18 21:10:16 +00:00
llpostprocess.h Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render-9) and QAR-1236 (dll-msvcrt-2) 2009-02-18 21:10:16 +00:00
llrender.cpp merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +00:00
llrender.h merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +00:00
llrendersphere.cpp 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
llrendersphere.h 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
llrendertarget.cpp merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
llrendertarget.h merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
llshadermgr.cpp QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergeme 2009-02-03 17:56:26 +00:00
llshadermgr.h 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
lltexture.cpp merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +00:00
lltexture.h merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +00:00
llvertexbuffer.cpp merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
llvertexbuffer.h merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00