diff options
author | Oz Linden <oz@lindenlab.com> | 2014-04-08 11:41:12 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2014-04-08 11:41:12 -0400 |
commit | 375c05ac43ed56c8ad9670dfdfc801085075a2a2 (patch) | |
tree | 2dcee4ef5757823430d5e234e23eedb1a3354d19 /indra/llvfs/llpidlock.cpp | |
parent | a60875e549aa90f1cef450aabaf23570cf20a22e (diff) | |
parent | 7e966f28da79d2d24f93a2615c8807421300700c (diff) |
merge changes for 3.7.5-release
Diffstat (limited to 'indra/llvfs/llpidlock.cpp')
-rwxr-xr-x | indra/llvfs/llpidlock.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llvfs/llpidlock.cpp b/indra/llvfs/llpidlock.cpp index 0424f2379e..b5fd3673a6 100755 --- a/indra/llvfs/llpidlock.cpp +++ b/indra/llvfs/llpidlock.cpp @@ -274,3 +274,8 @@ void LLPidLock::setSaveName(std::string savename) { LLPidLockFile::instance().mSaveName=savename; } + +S32 LLPidLock::getPID() +{ + return (S32)getpid(); +} |