diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-04-25 11:06:37 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-04-25 11:06:37 +0800 |
| commit | f7b2c0d7d95ca8609a948a7d11b44534d8ac5249 (patch) | |
| tree | b9d80bc52d207acf50ea01b465ab26749ba40f72 /indra/newview/llviewershadermgr.cpp | |
| parent | c82295910685c54acf597277e9dac0f70eb40239 (diff) | |
| parent | fc71a9c1ed96cb1cb97124e3cceabdfa11e1cc75 (diff) | |
Merge tag '7.1.6-release'
source for viewer 7.1.6.8745209917
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"); |