summaryrefslogtreecommitdiff
path: root/indra/llvfs
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2017-02-03 09:54:52 -0500
committerNat Goodspeed <nat@lindenlab.com>2017-02-03 09:54:52 -0500
commit434f0e161aa7b378ff16d526e104e580ba367ab2 (patch)
treea7eed0bd6d7278fa63c362fb7ddb4789d7408705 /indra/llvfs
parent080744d8990e6b18a80858803a20a5ec87020d82 (diff)
parentf40bd0fac308b21319d84ee221cb8f81d369dd71 (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