diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-01-30 15:48:44 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-01-30 15:48:44 -0500 |
| commit | 1ed8faee81804af2f0640784191f1deadfa9f50c (patch) | |
| tree | 1bbee24e0c0c388b1f0544145db8eff1588546f7 /indra/llcommon/llthread.h | |
| parent | 4ef9277761b5faee2825177112939b72c563a4ea (diff) | |
| parent | 717a6f3306d9382ea252c3e0f243b785c9cae15a (diff) | |
merge changes for vmrg-219
Diffstat (limited to 'indra/llcommon/llthread.h')
| -rw-r--r-- | indra/llcommon/llthread.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llcommon/llthread.h b/indra/llcommon/llthread.h index f0e0de6173..b52e70ab2e 100644 --- a/indra/llcommon/llthread.h +++ b/indra/llcommon/llthread.h @@ -151,6 +151,7 @@ public: void lock(); // blocks void unlock(); bool isLocked(); // non-blocking, but does do a lock/unlock so not free + bool isSelfLocked(); //return true if locked in a same thread U32 lockingThread() const; //get ID of locking thread protected: |