livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge changes for storm-1532

master
Oz Linden 2011-09-14 08:33:25 -04:00
parent 961c4d3816 677135f3c7
commit b2d20f5a98
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/contributions.txt
View File

@ -177,6 +177,8 @@ Ardy Lay
VWR-24917
Argent Stonecutter
VWR-68
ArminWeatherHax
STORM-1532
Armin Weatherwax
VWR-8436
ArminasX Saiman

31
indra/newview/llvoicevivox.cpp
View File

@ -4498,17 +4498,25 @@ bool LLVivoxVoiceClient::parcelVoiceInfoReceived(state requesting_state)
bool LLVivoxVoiceClient::requestParcelVoiceInfo()
{
LL_DEBUGS("Voice") << "sending ParcelVoiceInfoRequest (" << mCurrentRegionName << ", " << mCurrentParcelLocalID << ")" << LL_ENDL;
// grab the cap for parcel voice info from the region.
LLViewerRegion * region = gAgent.getRegion();
if (region == NULL)
if (region == NULL || !region->capabilitiesReceived())
{
// we don't have the cap yet, so return false so the caller can try again later.
LL_DEBUGS("Voice") << "ParcelVoiceInfoRequest capability not yet available, deferring" << LL_ENDL;
return false;
}
// grab the cap.
std::string url = gAgent.getRegion()->getCapability("ParcelVoiceInfoRequest");
if (!url.empty())
if (url.empty())
{
// Region dosn't have the cap. Stop probing.
LL_DEBUGS("Voice") << "ParcelVoiceInfoRequest capability not available in this region" << LL_ENDL;
setState(stateDisableCleanup);
return false;
}
else
{
// if we've already retrieved the cap from the region, go ahead and make the request,
// and return true so we can go into the state that waits for the response.
@ -4517,18 +4525,11 @@ bool LLVivoxVoiceClient::requestParcelVoiceInfo()
LL_DEBUGS("Voice") << "sending ParcelVoiceInfoRequest (" << mCurrentRegionName << ", " << mCurrentParcelLocalID << ")" << LL_ENDL;
LLHTTPClient::post(
url,
data,
new LLVivoxVoiceClientCapResponder(getState()));
url,
data,
new LLVivoxVoiceClientCapResponder(getState()));
return true;
}
else
{
// we don't have the cap yet, so return false so the caller can try again later.
LL_DEBUGS("Voice") << "ParcelVoiceInfoRequest cap not yet available, deferring" << LL_ENDL;
return false;
}
}
void LLVivoxVoiceClient::switchChannel(