diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-05-31 10:36:10 -0700 | 
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-05-31 10:36:10 -0700 | 
| commit | 9831087fb605d14cc7a9818b82b36a6c0d7ca8a1 (patch) | |
| tree | 817a963e96262a652fa0c662cd51dc28506a3eb7 | |
| parent | 91f62d1c9cf1d78c6d3b70c8c296d20df873263e (diff) | |
Use llmin rather than std::min
| -rw-r--r-- | indra/newview/llenvironment.cpp | 2 | 
1 files changed, 1 insertions, 1 deletions
| diff --git a/indra/newview/llenvironment.cpp b/indra/newview/llenvironment.cpp index e0cfbbf79e..54275446e3 100644 --- a/indra/newview/llenvironment.cpp +++ b/indra/newview/llenvironment.cpp @@ -1529,7 +1529,7 @@ S32 LLEnvironment::calculateSkyTrackForAltitude(F64 altitude)      else if (it == mTrackAltitudes.end())          return 4; -    return std::min(std::distance(mTrackAltitudes.begin(), it), 4LL); +    return llmin(std::distance(mTrackAltitudes.begin(), it), 4LL);  } | 
