Merge and fix MAINT-9087 and MAINT-9084
Showing
- indra/llrender/llglslshader.cpp 5 additions, 5 deletionsindra/llrender/llglslshader.cpp
- indra/newview/app_settings/shaders/class1/deferred/starsF.glsl 17 additions, 4 deletions.../newview/app_settings/shaders/class1/deferred/starsF.glsl
- indra/newview/app_settings/shaders/class1/deferred/starsV.glsl 4 additions, 0 deletions.../newview/app_settings/shaders/class1/deferred/starsV.glsl
- indra/newview/lldrawpoolwlsky.cpp 12 additions, 7 deletionsindra/newview/lldrawpoolwlsky.cpp
- indra/newview/llviewershadermgr.cpp 2 additions, 0 deletionsindra/newview/llviewershadermgr.cpp
- indra/newview/llvosky.cpp 25 additions, 7 deletionsindra/newview/llvosky.cpp
- indra/newview/llvosky.h 1 addition, 1 deletionindra/newview/llvosky.h
- indra/newview/llvowlsky.cpp 1 addition, 1 deletionindra/newview/llvowlsky.cpp
- indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml 1 addition, 1 deletion...wview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
Loading
Please register or sign in to comment