Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Silence voice complaint about missing cap

Browse Source
This commit is contained in:
Siana Gearz
2013-01-27 04:42:00 +01:00
parent 7755033017
commit 50a360d314
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llviewerregion.cpp
View File

@@ -1828,7 +1828,7 @@ std::string LLViewerRegion::getCapability(const std::string& name) const
{
if (!capabilitiesReceived() && (name!=std::string("Seed")) && (name!=std::string("ObjectMedia")))
{
llwarns << "getCapability called before caps received" << llendl;
llwarns << "getCapability("<<name<<") called before caps received" << llendl;
}
CapabilityMap::const_iterator iter = mImpl->mCapabilities.find(name);

4
indra/newview/llvoiceclient.cpp
View File

@@ -1579,7 +1579,7 @@ void LLVoiceClient::stateMachine()
LLViewerRegion *region = gAgent.getRegion();
LLParcel *parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
if(region && parcel)
if(region && parcel && region->capabilitiesReceived())
{
S32 parcelLocalID = parcel->getLocalID();
std::string regionName = region->getName();
@@ -1876,7 +1876,7 @@ void LLVoiceClient::stateMachine()
{
LLViewerRegion *region = gAgent.getRegion();
if(region)
if(region && region->capabilitiesReceived())
{
if ( region->getCapability("ProvisionVoiceAccountRequest") != "" )
{