7d50a51434
# Conflicts: # indra/newview/CMakeLists.txt # indra/newview/VIEWER_VERSION.txt # indra/newview/llagent.cpp # indra/newview/llfloaternewfeaturenotification.cpp # indra/newview/llinventorybridge.cpp # indra/newview/llinventorymodel.cpp # indra/newview/lloutfitgallery.cpp # indra/newview/llpanelmaininventory.cpp # indra/newview/llpanelmaininventory.h # indra/newview/llsidepaneltaskinfo.cpp # indra/newview/llsidepaneltaskinfo.h # indra/newview/lltexturectrl.cpp # indra/newview/lltexturectrl.h # indra/newview/llviewerinventory.cpp # indra/newview/llviewerobject.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llviewertexturelist.h # indra/newview/skins/default/xui/en/floater_new_feature_notification.xml # indra/newview/skins/default/xui/en/menu_inventory.xml |
||
|---|---|---|
| .. | ||
| CMakeLists.txt | ||
| llatmosphere.cpp | ||
| llatmosphere.h | ||
| llcubemap.cpp | ||
| llcubemap.h | ||
| llcubemaparray.cpp | ||
| llcubemaparray.h | ||
| llfontbitmapcache.cpp | ||
| llfontbitmapcache.h | ||
| llfontfreetype.cpp | ||
| llfontfreetype.h | ||
| llfontgl.cpp | ||
| llfontgl.h | ||
| llfontregistry.cpp | ||
| llfontregistry.h | ||
| llgl.cpp | ||
| llgl.h | ||
| llglcommonfunc.cpp | ||
| llglcommonfunc.h | ||
| llglheaders.h | ||
| llglslshader.cpp | ||
| llglslshader.h | ||
| llglstates.h | ||
| llgltexture.cpp | ||
| llgltexture.h | ||
| llgltypes.h | ||
| llimagegl.cpp | ||
| llimagegl.h | ||
| llpostprocess.cpp | ||
| llpostprocess.h | ||
| llrender.cpp | ||
| llrender.h | ||
| llrender2dutils.cpp | ||
| llrender2dutils.h | ||
| llrendernavprim.cpp | ||
| llrendernavprim.h | ||
| llrendersphere.cpp | ||
| llrendersphere.h | ||
| llrendertarget.cpp | ||
| llrendertarget.h | ||
| llshadermgr.cpp | ||
| llshadermgr.h | ||
| lltexture.cpp | ||
| lltexture.h | ||
| lltexturemanagerbridge.cpp | ||
| lltexturemanagerbridge.h | ||
| lluiimage.cpp | ||
| lluiimage.h | ||
| lluiimage.inl | ||
| llvertexbuffer.cpp | ||
| llvertexbuffer.h | ||