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/newview | |
| parent | 391d9a367b61fe8098ffff0d6a6a54f65f0a3a9e (diff) | |
| parent | 0c915913fd05007bb3fb6cc84be89799b7d85ae5 (diff) | |
Automated merge with file:///Users/nat/linden/maint-4952-v-t-u
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llviewerregion.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index b256482289..291af28bc3 100755 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -2919,7 +2919,7 @@ void LLViewerRegion::setSeedCapability(const std::string& url) setCapability("Seed", url); std::string coroname = - LLCoros::instance().launch("LLEnvironmentRequest::environmentRequestCoro", + LLCoros::instance().launch("LLViewerRegionImpl::requestBaseCapabilitiesCoro", boost::bind(&LLViewerRegionImpl::requestBaseCapabilitiesCoro, mImpl, getHandle())); LL_INFOS("AppInit", "Capabilities") << "Launching " << coroname << " requesting seed capabilities from " << url << LL_ENDL; |