diff options
author | Oz Linden <oz@lindenlab.com> | 2016-12-22 11:16:55 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2016-12-22 11:16:55 -0500 |
commit | be69197e0d3af1832a22c6d2475e3e1178a88a31 (patch) | |
tree | de9abd1dfc12d6da7e11e385c7dbbb53e631353a /indra/llvfs/lldir_mac.cpp | |
parent | 04c7a7a64ac40f471dcec0019a2c7235ad22bd3d (diff) | |
parent | e9f5ed6591fb5d2513b5065622b9e7dac6737913 (diff) |
merge changes from project trunk
Diffstat (limited to 'indra/llvfs/lldir_mac.cpp')
-rw-r--r-- | indra/llvfs/lldir_mac.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llvfs/lldir_mac.cpp b/indra/llvfs/lldir_mac.cpp index 30a1ac975e..e776b84a12 100644 --- a/indra/llvfs/lldir_mac.cpp +++ b/indra/llvfs/lldir_mac.cpp @@ -94,7 +94,7 @@ LLDir_Mac::LLDir_Mac() // MBW -- This keeps the mac application from finding other things. // If this is really for skins, it should JUST apply to skins. - std::size_t build_dir_pos = mExecutableDir.rfind("/build-darwin-"); + std::string::size_type build_dir_pos = mExecutableDir.rfind("/build-darwin-"); if (build_dir_pos != std::string::npos) { // ...we're in a dev checkout |