diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-05-15 11:16:27 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-05-15 11:16:27 +0300 |
| commit | bccc10db9a90d365c353baebf443fde2030ce970 (patch) | |
| tree | 2c2e1fd94b29667a809f8d7285d049f5ff5d424d /indra/llrender/llglcommonfunc.cpp | |
| parent | 531cd34f670170ade57f8813fe48012b61a1d3c2 (diff) | |
| parent | bb3c36f5cbc0c3b542045fd27255eee24e03da22 (diff) | |
Merge branch 'main' into marchcat/x-b-merge
# Conflicts:
# autobuild.xml
# indra/cmake/ConfigurePkgConfig.cmake
# indra/cmake/ICU4C.cmake
# indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.cpp
# indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.h
# indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h
# indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp
# indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.h
# indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
# indra/newview/llappviewerlinux_api.h
# indra/newview/llappviewerlinux_api_dbus.cpp
# indra/newview/llappviewerlinux_api_dbus.h
# indra/newview/llfloateremojipicker.cpp
# indra/newview/lloutfitslist.cpp
Diffstat (limited to 'indra/llrender/llglcommonfunc.cpp')
| -rw-r--r-- | indra/llrender/llglcommonfunc.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/llrender/llglcommonfunc.cpp b/indra/llrender/llglcommonfunc.cpp index 04d29b9430..13b08de7cc 100644 --- a/indra/llrender/llglcommonfunc.cpp +++ b/indra/llrender/llglcommonfunc.cpp @@ -27,12 +27,12 @@ #include "llglheaders.h" #include "llglcommonfunc.h" -namespace LLGLCommonFunc +namespace LLGLCommonFunc { - void selected_stencil_test() - { + void selected_stencil_test() + { // deprecated - //glStencilFunc(GL_ALWAYS, 2, 0xffff); - //glStencilOp(GL_KEEP, GL_KEEP, GL_REPLACE); - } + //glStencilFunc(GL_ALWAYS, 2, 0xffff); + //glStencilOp(GL_KEEP, GL_KEEP, GL_REPLACE); + } } |