diff options
author | Oz Linden <oz@lindenlab.com> | 2018-01-19 11:18:29 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2018-01-19 11:18:29 -0500 |
commit | a7911c43791a76f0f93f920f527970125afdc730 (patch) | |
tree | 99228045170856cf7721e83274bc9d74b45f42a4 /indra/llvfs/lldir_mac.cpp | |
parent | 444643aeb0b80fdfbe28e0e2faae56de9d4f6e4a (diff) | |
parent | 7acbd8ed8d73c507675d45360df07d232c431a8b (diff) |
merge changes for 5.1.0-release
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 4038c92465..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. - U32 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 |