diff options
author | simon <none@none> | 2013-05-09 14:10:45 -0700 |
---|---|---|
committer | simon <none@none> | 2013-05-09 14:10:45 -0700 |
commit | ee2fce8790b69d61845cc32fbf7cdce8a33b0dab (patch) | |
tree | 5060f42dca293102c868038f127c1a74f5c4a6aa /indra/llcommon/llcoros.cpp | |
parent | cd8e0b92e1c8f9f8544b1011e61c21c7789b93b7 (diff) | |
parent | 8895e795763d14c3dae495b3648da3d4a52ba30a (diff) |
Merge downstream code and viewer-beta
Diffstat (limited to 'indra/llcommon/llcoros.cpp')
-rwxr-xr-x[-rw-r--r--] | indra/llcommon/llcoros.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llcoros.cpp b/indra/llcommon/llcoros.cpp index 0b5829eb7e..9122704306 100644..100755 --- a/indra/llcommon/llcoros.cpp +++ b/indra/llcommon/llcoros.cpp @@ -115,7 +115,7 @@ std::string LLCoros::getNameByID(const void* self_id) const // passed to us comes. for (CoroMap::const_iterator mi(mCoros.begin()), mend(mCoros.end()); mi != mend; ++mi) { - namespace coro_private = boost::coroutines::detail; + namespace coro_private = boost::dcoroutines::detail; if (static_cast<void*>(coro_private::coroutine_accessor::get_impl(const_cast<coro&>(*mi->second)).get()) == self_id) { |