summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2009-06-04 02:37:59 +0000
committerNat Goodspeed <nat@lindenlab.com>2009-06-04 02:37:59 +0000
commita3d54c48c6366a8a38e20a5aacd90bbc39018512 (patch)
tree9125e0cef4fc4dc494e7855f15410263952df285
parent46291bf740f3eacd7030a64b319cce94551c8447 (diff)
DEV-32777: When launching login coroutine, instead of binding _2, _3
placeholders and then asking Boost.Coroutine to pass parameters to them, simply bind the desired values.
-rw-r--r--indra/viewer_components/login/lllogin.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/indra/viewer_components/login/lllogin.cpp b/indra/viewer_components/login/lllogin.cpp
index c6ed98c6b6..92384a1c5b 100644
--- a/indra/viewer_components/login/lllogin.cpp
+++ b/indra/viewer_components/login/lllogin.cpp
@@ -118,18 +118,17 @@ private:
void LLLogin::Impl::connect(const std::string& uri, const LLSD& credentials)
{
- // Launch a coroutine with our login_() method; placeholders forward the
- // params. Run the coroutine until its first wait; at that point, return
- // here.
+ // Launch a coroutine with our login_() method. Run the coroutine until
+ // its first wait; at that point, return here.
std::string coroname =
LLCoros::instance().launch<coroutine_type>("LLLogin::Impl::login_",
- boost::bind(&Impl::login_, this, _1, _2, _3),
- uri, credentials);
+ boost::bind(&Impl::login_, this, _1, uri, credentials));
}
void LLLogin::Impl::login_(coroutine_type::self& self, std::string uri, LLSD credentials)
{
- LL_INFOS("LLLogin") << "Entering coroutine " << LLCoros::instance().getName(self) << LL_ENDL;
+ LL_INFOS("LLLogin") << "Entering coroutine " << LLCoros::instance().getName(self)
+ << " with uri '" << uri << "', credentials " << credentials << LL_ENDL;
// Arriving in SRVRequest state
LLEventStream replyPump("reply", true);
// Should be an array of one or more uri strings.