Siana Gearz
|
8e19372adf
|
Merge branch 'V2Baking' of git://github.com/Shyotl/SingularityViewer into V2Baking
Conflicts:
indra/llrender/llshadermgr.cpp
indra/newview/llmorphview.cpp
indra/newview/lltexlayer.cpp
indra/newview/lltexlayer.h
indra/newview/lltoolmorph.cpp
indra/newview/llvoavatar.cpp
indra/newview/llvoavatar.h
|
2012-01-06 14:18:46 +01:00 |
|
Shyotl
|
ca96e00135
|
Enable gl sync fence. Missed a vertexbuffer flush. moved LLMultiFloater out of llfloater.(h|cpp) and into its own header and source file, matching v2.
|
2011-12-26 23:40:18 -06:00 |
|
Shyotl
|
722e7d09ff
|
Innitial commit. Majority of texture baking moved into LLVOAvatarSelf. Very WIP. Not advisable to build off of this, although it does compile and mostly work.
|
2011-10-22 20:36:04 -05:00 |
|
Shyotl
|
74dc875a27
|
Beginning to pull LLVOAvatarSelf out from LLVOAvatar.
|
2011-10-02 02:51:10 -05:00 |
|
Shyotl
|
a07e399801
|
LLAgentCamera transition (1/2)
|
2011-06-07 21:35:10 -05:00 |
|
Hazim Gazov
|
7a86d01598
|
Imported existing code
|
2010-04-02 02:48:44 -03:00 |
|