| .. |
|
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
|
revisit the fix for these:
|
2009-09-10 19:08:11 +00:00 |
|
llfontbitmapcache.h
|
revisit the fix for these:
|
2009-09-10 19:08:11 +00:00 |
|
llfontfreetype.cpp
|
revisit the fix for these:
|
2009-09-10 19:08:11 +00:00 |
|
llfontfreetype.h
|
r128438 introduced a hilarious piece of mergefuckery about five weeks ago. eyeball this diff for a good laugh. I've verified that the evil twin is *identical*.
|
2009-09-10 20:04:37 +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 https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1566 https://svn.aws.productengine.com/secondlife/pe/stable-2@1580 -> viewer-2.0.0-3
|
2009-09-07 22:55:07 +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
|
Getting rid of "gl used while not active" test until such time as it is needed/useful (when threading is revisited).
|
2009-09-23 08:02:49 +00:00 |
|
llgl.h
|
Merging render-pipeline-6-qa-2 into viewer-2
|
2009-09-22 11:11:45 +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
|
Merging render-pipeline-6-qa-2 into viewer-2
|
2009-09-22 11:11:45 +00:00 |
|
llimagegl.h
|
Merging render-pipeline-6-qa-2 into viewer-2
|
2009-09-22 11:11:45 +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
|
Merging render-pipeline-6-qa-2 into viewer-2
|
2009-09-22 11:11:45 +00:00 |
|
llrender.h
|
Merging render-pipeline-6-qa-2 into viewer-2
|
2009-09-22 11:11:45 +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
|
SNOW-194 DEV-40415: pulling this snowglobe patch into viewer 2.0. This
|
2009-09-25 16:51:25 +00:00 |
|
llrendertarget.h
|
Merging render-pipeline-6-qa-2 into viewer-2
|
2009-09-22 11:11:45 +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 |
b5724bc0e9