diff options
author | Aleric Inglewood | 2010-11-07 16:55:50 +0100 |
---|---|---|
committer | Aleric Inglewood | 2010-11-07 18:27:48 +0100 |
commit | 5b4356cefbaa7dbdc8656e7283c110a893b1a89c (patch) | |
tree | 43fae9945562c3281746370d623877840ed884b2 /linden/indra/llvfs/llpidlock.cpp | |
parent | IMP-688: ERROR: getString: Invalid string control nick01 (diff) | |
download | meta-impy-5b4356cefbaa7dbdc8656e7283c110a893b1a89c.zip meta-impy-5b4356cefbaa7dbdc8656e7283c110a893b1a89c.tar.gz meta-impy-5b4356cefbaa7dbdc8656e7283c110a893b1a89c.tar.bz2 meta-impy-5b4356cefbaa7dbdc8656e7283c110a893b1a89c.tar.xz |
IMP-692: SNOW-713: Global objects in libllcommon duplicated in plugins
See http://jira.secondlife.com/browse/SNOW-713
This patch makes llcommon shared. It contains the following snowglobe
(SVN) changesets: 3478, 3479, 3480, 3481, 3482, 3485, 3496, 3498, 3500,
3519 and 3531, plus the fix for all rejects. Note that changes
to scripts/automated_build_scripts/opensrc-build.sh (changesets 3500
and 3625) were ignored as we don't have scripts/automated_build_scripts.
Diffstat (limited to 'linden/indra/llvfs/llpidlock.cpp')
-rwxr-xr-x | linden/indra/llvfs/llpidlock.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linden/indra/llvfs/llpidlock.cpp b/linden/indra/llvfs/llpidlock.cpp index 93ac120..cb64428 100755 --- a/linden/indra/llvfs/llpidlock.cpp +++ b/linden/indra/llvfs/llpidlock.cpp | |||
@@ -39,6 +39,7 @@ | |||
39 | #include "llsdserialize.h" | 39 | #include "llsdserialize.h" |
40 | #include "llnametable.h" | 40 | #include "llnametable.h" |
41 | #include "llframetimer.h" | 41 | #include "llframetimer.h" |
42 | #include "llapp.h" | ||
42 | 43 | ||
43 | #if LL_WINDOWS //For windows platform. | 44 | #if LL_WINDOWS //For windows platform. |
44 | bool isProcessAlive(U32 pid) | 45 | bool isProcessAlive(U32 pid) |
@@ -60,7 +61,7 @@ class LLPidLockFile | |||
60 | public: | 61 | public: |
61 | LLPidLockFile( ) : | 62 | LLPidLockFile( ) : |
62 | mSaving(FALSE), mWaiting(FALSE), | 63 | mSaving(FALSE), mWaiting(FALSE), |
63 | mClean(TRUE), mPID(getpid()) | 64 | mClean(TRUE), mPID(LLApp::getPid()) |
64 | { | 65 | { |
65 | mLockName = gDirUtilp->getTempDir() + "/savelock"; | 66 | mLockName = gDirUtilp->getTempDir() + "/savelock"; |
66 | } | 67 | } |