| .. |
|
CMakeLists.txt
|
merge QAR-1579: texture-cleanup-1.
|
2009-07-10 22:02: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
|
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
|
2009-06-21 08:04:56 +00:00 |
|
llfontgl.cpp
|
merge QAR-1579: texture-cleanup-1.
|
2009-07-10 22:02:26 +00:00 |
|
llfontgl.h
|
merge QAR-1579: texture-cleanup-1.
|
2009-07-10 22:02:26 +00:00 |
|
llfontregistry.cpp
|
Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files:
|
2009-07-07 00:53:05 +00:00 |
|
llfontregistry.h
|
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
|
2009-06-21 08:04:56 +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
|
add LLImageGL::create(...) back for server side use.
|
2009-07-11 02:09:37 +00:00 |
|
llimagegl.h
|
add LLImageGL::create(...) back for server side use.
|
2009-07-11 02:09:37 +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 |
104f32750e