diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-24 19:48:25 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-24 19:48:25 +0300 |
| commit | 1bcc4e7f709bf7067121b5891f3f7db3b99235a0 (patch) | |
| tree | bc9cea56b8e236f52df392084552018c387cff2c /indra/newview/llviewershadermgr.cpp | |
| parent | 09454c53a48e88a9cdd54f68ac507694a766b213 (diff) | |
| parent | 428f21cf795f440f69a772b314f877ea0c6d4741 (diff) | |
Merge pull request #1313 from secondlife/marchcat/x-merge
Release (Maint YZ) -> Maint X merge
Diffstat (limited to 'indra/newview/llviewershadermgr.cpp')
| -rw-r--r-- | indra/newview/llviewershadermgr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp index 3225299493..2bab50300b 100644 --- a/indra/newview/llviewershadermgr.cpp +++ b/indra/newview/llviewershadermgr.cpp @@ -592,7 +592,7 @@ std::string LLViewerShaderMgr::loadBasicShaders() std::map<std::string, std::string> attribs; attribs["MAX_JOINTS_PER_MESH_OBJECT"] = - boost::lexical_cast<std::string>(LLSkinningUtil::getMaxJointCount()); + std::to_string(LLSkinningUtil::getMaxJointCount()); BOOL ssr = gSavedSettings.getBOOL("RenderScreenSpaceReflections"); |