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

Merge

meow-7.2.2
Rider Linden 2018-11-21 12:52:35 -08:00
parent 8067bd824e 62720cf5dd
commit 8d3e5a3eac
2 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/llinventory/llparcel.h
View File

@ -103,8 +103,9 @@ const U32 RT_SELL = 0x1 << 5;
const S32 INVALID_PARCEL_ID = -1;
// if Region settings are used, parcel env. version is -1
const S32 INVALID_PARCEL_ENVIRONMENT_VERSION = -2;
// if Region settings are used, parcel env. version is -1
const S32 UNSET_PARCEL_ENVIRONMENT_VERSION = -1;
// Timeouts for parcels
// default is 21 days * 24h/d * 60m/h * 60s/m *1000000 usec/s = 1814400000000

33
indra/newview/llpanelenvironment.cpp
View File

@ -797,16 +797,21 @@ void LLPanelEnvironmentInfo::onEnvironmentChanged(LLEnvironment::EnvSelection_t
// Panel receives environment from different sources, from environment update callbacks,
// from hovers (causes callbacks on version change) and from personal requests
// filter out dupplicates and out of order packets by checking parcel environment version.
LL_DEBUGS("ENVPANEL") << "Received environment update " << mCurEnvVersion << " " << (getParcel() ? getParcel()->getParcelEnvironmentVersion() : (S32)-1) << LL_ENDL;
LLParcel *parcel = getParcel();
if (parcel && mCurEnvVersion < parcel->getParcelEnvironmentVersion())
if (parcel)
{
mCurrentEnvironment.reset();
refreshFromSource();
}
else
{
refresh();
S32 new_version = parcel->getParcelEnvironmentVersion();
LL_DEBUGS("ENVPANEL") << "Received environment update " << mCurEnvVersion << " " << new_version << LL_ENDL;
if (mCurEnvVersion < new_version
|| (mCurEnvVersion != new_version && new_version == UNSET_PARCEL_ENVIRONMENT_VERSION))
{
mCurrentEnvironment.reset();
refreshFromSource();
}
else
{
refresh();
}
}
}
}
@ -837,16 +842,24 @@ void LLPanelEnvironmentInfo::onEnvironmentReceived(S32 parcel_id, LLEnvironment:
if (parcel_id == INVALID_PARCEL_ID)
{
// region, no version
mCurEnvVersion = 1;
// -2 for invalid version viewer -1 for invalid version from server
mCurEnvVersion = UNSET_PARCEL_ENVIRONMENT_VERSION;
}
else
{
LLParcel* parcel = getParcel();
if (parcel)
if (parcel
&& mCurrentEnvironment->mDayCycle
&& mCurrentEnvironment->mDayCycle->getAssetId() != LLSettingsDay::GetDefaultAssetId())
{
// not always up to date, we will get onEnvironmentChanged() update in such case.
mCurEnvVersion = parcel->getParcelEnvironmentVersion();
}
else
{
// When using 'region' as parcel environment
mCurEnvVersion = UNSET_PARCEL_ENVIRONMENT_VERSION;
}
LL_DEBUGS("ENVPANEL") << " Setting environment version: " << mCurEnvVersion << LL_ENDL;
}
refresh();