phoenix-firestorm/indra/llrender
Nicky 161c1b019f Merge up from 24496 / a656486925e8 (FS tip) to 25952 / 931cb0061118 (V/Dev FUI tip)
Observations and broken stuff so far:
- LLSideTray is gone.
- LLBottomTray is gone.
- LLFloaterSnapshot was changed and gave lots of merge conflicts. Flickr upload will be broken.
- LLNearbyChat is derived from LLPanel now. That broke quite some stuff rearding autohiding and docking of chatbar.
- Profile floaters are gone and all web based now.
- Russian translation gave huge mere conflicts with the new russian xml files from LL. Unmergeable. I took the LL files.
- XUI files in general will need some love and testing.
2012-01-17 17:57:52 +01:00
..
CMakeLists.txt
llcubemap.cpp
llcubemap.h
llfontbitmapcache.cpp
llfontbitmapcache.h
llfontfreetype.cpp
llfontfreetype.h
llfontgl.cpp storm-1723: fix character display when a lot of different characters are used 2011-12-15 15:19:50 -05:00
llfontgl.h
llfontregistry.cpp
llfontregistry.h
llgl.cpp
llgl.h
llgldbg.cpp
llgldbg.h
llglheaders.h
llglslshader.cpp
llglslshader.h
llglstates.h
llgltypes.h
llimagegl.cpp
llimagegl.h
llpostprocess.cpp
llpostprocess.h
llrender.cpp Merge up from 24496 / a656486925e8 (FS tip) to 25952 / 931cb0061118 (V/Dev FUI tip) 2012-01-17 17:57:52 +01:00
llrender.h
llrendersphere.cpp
llrendersphere.h
llrendertarget.cpp
llrendertarget.h
llshadermgr.cpp Merge up from 24496 / a656486925e8 (FS tip) to 25952 / 931cb0061118 (V/Dev FUI tip) 2012-01-17 17:57:52 +01:00
llshadermgr.h
lltexture.cpp
lltexture.h
llvertexbuffer.cpp
llvertexbuffer.h