summaryrefslogtreecommitdiff
path: root/indra/llvfs
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2017-03-06 14:27:29 -0500
committerNat Goodspeed <nat@lindenlab.com>2017-03-06 14:27:29 -0500
commit1771857e6c538382e86ea5b69e36fe8fbaa59f08 (patch)
tree6182c291393b8dbb141d7519b8f1b77d61526774 /indra/llvfs
parent08ed7f676f2ce38937a03c2a4e823e3564981264 (diff)
parentbfdbda24bf96b85104742f5578b5a921bc91a1d8 (diff)
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/llvfs')
-rw-r--r--indra/llvfs/lldir_mac.cpp2
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