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
…
llcubemap.h
…
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
…
llgldbg.h
…
llglheaders.h
…
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
…
llglstates.h
…
llgltypes.h
…
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
…
llpostprocess.h
…
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
…
llrendersphere.h
…
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
…
llshadermgr.h
…
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