Merge 6.1.2 LoveMeRender new hotness
No related branches found
No related tags found
Showing
- .hgtags 1 addition, 0 deletions.hgtags
- autobuild.xml 1 addition, 1 deletionautobuild.xml
- doc/contributions.txt 2 additions, 0 deletionsdoc/contributions.txt
- indra/llmath/llvolume.cpp 3 additions, 2 deletionsindra/llmath/llvolume.cpp
- indra/llprimitive/llmaterial.cpp 349 additions, 109 deletionsindra/llprimitive/llmaterial.cpp
- indra/llprimitive/llmaterial.h 107 additions, 106 deletionsindra/llprimitive/llmaterial.h
- indra/llprimitive/lltextureentry.h 2 additions, 0 deletionsindra/llprimitive/lltextureentry.h
- indra/llrender/llgl.cpp 9 additions, 1 deletionindra/llrender/llgl.cpp
- indra/llrender/llshadermgr.cpp 0 additions, 2 deletionsindra/llrender/llshadermgr.cpp
- indra/llui/lltooltip.cpp 3 additions, 7 deletionsindra/llui/lltooltip.cpp
- indra/llui/llui.cpp 6 additions, 2 deletionsindra/llui/llui.cpp
- indra/llwindow/llopenglview-objc.mm 40 additions, 14 deletionsindra/llwindow/llopenglview-objc.mm
- indra/llwindow/llwindowcallbacks.cpp 5 additions, 0 deletionsindra/llwindow/llwindowcallbacks.cpp
- indra/llwindow/llwindowcallbacks.h 1 addition, 0 deletionsindra/llwindow/llwindowcallbacks.h
- indra/llwindow/llwindowmacosx-objc.h 9 additions, 1 deletionindra/llwindow/llwindowmacosx-objc.h
- indra/llwindow/llwindowmacosx-objc.mm 18 additions, 6 deletionsindra/llwindow/llwindowmacosx-objc.mm
- indra/llwindow/llwindowmacosx.cpp 32 additions, 14 deletionsindra/llwindow/llwindowmacosx.cpp
- indra/llwindow/llwindowmacosx.h 2 additions, 1 deletionindra/llwindow/llwindowmacosx.h
- indra/newview/VIEWER_VERSION.txt 1 addition, 1 deletionindra/newview/VIEWER_VERSION.txt
- indra/newview/app_settings/settings.xml 12 additions, 12 deletionsindra/newview/app_settings/settings.xml
Loading
Please register or sign in to comment