diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-05-31 11:15:17 -0700 | 
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-05-31 11:15:17 -0700 | 
| commit | 460d944b082ae73bbad3cf1d72a47ffa88970fb9 (patch) | |
| tree | a94deaca1f8fc760e6ad562a8966a9f1cae6eaaa | |
| parent | 9831087fb605d14cc7a9818b82b36a6c0d7ca8a1 (diff) | |
More with min
| -rw-r--r-- | indra/newview/llenvironment.cpp | 4 | 
1 files changed, 3 insertions, 1 deletions
| diff --git a/indra/newview/llenvironment.cpp b/indra/newview/llenvironment.cpp index 54275446e3..21ecf7741b 100644 --- a/indra/newview/llenvironment.cpp +++ b/indra/newview/llenvironment.cpp @@ -28,6 +28,8 @@  #include "llenvironment.h" +#include <algorithm> +  #include "llagent.h"  #include "llviewercontrol.h" // for gSavedSettings  #include "llviewerregion.h" @@ -1529,7 +1531,7 @@ S32 LLEnvironment::calculateSkyTrackForAltitude(F64 altitude)      else if (it == mTrackAltitudes.end())          return 4; -    return llmin(std::distance(mTrackAltitudes.begin(), it), 4LL); +    return std::min(static_cast<S32>(std::distance(mTrackAltitudes.begin(), it)), 4);  } | 
