summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorRichard Linden <none@none>2012-09-24 19:01:48 -0700
committerRichard Linden <none@none>2012-09-24 19:01:48 -0700
commit308ff886c3ab2aa561477921bc0d92e1bd7d399a (patch)
tree5db9d358cc1a8c8a1061537efd69019c6bb4f2d2 /indra
parentadeeabfc13c91dc99a1ea1949cd2f820c4150995 (diff)
fixed build
moved LLThread::lockData and unlockData back to header
Diffstat (limited to 'indra')
-rw-r--r--indra/llcommon/llthread.cpp10
-rw-r--r--indra/llcommon/llthread.h12
2 files changed, 12 insertions, 10 deletions
diff --git a/indra/llcommon/llthread.cpp b/indra/llcommon/llthread.cpp
index 023004eedd..de1f0801a1 100644
--- a/indra/llcommon/llthread.cpp
+++ b/indra/llcommon/llthread.cpp
@@ -308,13 +308,3 @@ void LLThread::wakeLocked()
mRunCondition->signal();
}
}
-
-void LLThread::lockData()
-{
- mRunCondition->lock();
-}
-
-void LLThread::unlockData()
-{
- mRunCondition->unlock();
-}
diff --git a/indra/llcommon/llthread.h b/indra/llcommon/llthread.h
index e50fa7653d..fed111b0e4 100644
--- a/indra/llcommon/llthread.h
+++ b/indra/llcommon/llthread.h
@@ -136,6 +136,18 @@ protected:
// mRunCondition->unlock();
};
+
+void LLThread::lockData()
+{
+ mRunCondition->lock();
+}
+
+void LLThread::unlockData()
+{
+ mRunCondition->unlock();
+}
+
+
//============================================================================
#endif // LL_LLTHREAD_H