diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2015-07-10 19:37:19 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2015-07-10 19:37:19 -0400 |
commit | 9bde72f784a4836c3d19ef4dbcd49d4414640d8e (patch) | |
tree | 7f5baa9b4bc0c6f69454b603d45d8b0518528bed /indra/llcommon/lleventcoro.cpp | |
parent | 391d9a367b61fe8098ffff0d6a6a54f65f0a3a9e (diff) | |
parent | 0c915913fd05007bb3fb6cc84be89799b7d85ae5 (diff) |
Automated merge with file:///Users/nat/linden/maint-4952-v-t-u
Diffstat (limited to 'indra/llcommon/lleventcoro.cpp')
-rwxr-xr-x | indra/llcommon/lleventcoro.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/lleventcoro.cpp b/indra/llcommon/lleventcoro.cpp index e400a052a1..a37b87f085 100755 --- a/indra/llcommon/lleventcoro.cpp +++ b/indra/llcommon/lleventcoro.cpp @@ -298,7 +298,7 @@ WaitForEventOnHelper<LISTENER> wfeoh(const LISTENER& listener, int discriminator namespace llcoro { - boost::dcoroutines::future<LLEventWithID> future(llcoro::get_self()); + boost::dcoroutines::future<LLEventWithID> future(LLCoros::get_self()); std::string name(listenerNameForCoro()); wfeoh(boost::dcoroutines::make_callback(future), 0))); wfeoh(boost::dcoroutines::make_callback(future), 1))); |