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

Merge

meow-7.2.2
Graham Linden 2018-06-05 19:22:31 +01:00
parent 197fbaa7f6 610a793aa8
commit 6b7f624a4b
4 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
indra/llinventory/llsettingssky.cpp
View File

@ -1053,4 +1053,3 @@ LLUUID LLSettingsSky::GetDefaultAssetId()
{
return DEFAULT_ASSET_ID;
}

1
indra/llrender/llrender.cpp
View File

@ -2437,4 +2437,3 @@ glh::matrix4f gl_lookat(LLVector3 eye, LLVector3 center, LLVector3 up)
0, 0, 0, 1);
}

12
indra/newview/llenvironment.cpp
View File

@ -1134,7 +1134,7 @@ void LLEnvironment::requestRegion()
requestParcel(INVALID_PARCEL_ID);
}
void LLEnvironment::updateRegion(LLSettingsDay::ptr_t &pday, S32 day_length, S32 day_offset)
void LLEnvironment::updateRegion(const LLSettingsDay::ptr_t &pday, S32 day_length, S32 day_offset)
{
if (!isExtendedEnvironmentEnabled())
{
@ -1157,12 +1157,12 @@ void LLEnvironment::updateRegion(const LLUUID &asset_id, S32 day_length, S32 day
updateParcel(INVALID_PARCEL_ID, asset_id, day_length, day_offset);
}
void LLEnvironment::updateRegion(LLSettingsSky::ptr_t &psky, S32 day_length, S32 day_offset)
void LLEnvironment::updateRegion(const LLSettingsSky::ptr_t &psky, S32 day_length, S32 day_offset)
{
updateParcel(INVALID_PARCEL_ID, psky, day_length, day_offset);
}
void LLEnvironment::updateRegion(LLSettingsWater::ptr_t &pwater, S32 day_length, S32 day_offset)
void LLEnvironment::updateRegion(const LLSettingsWater::ptr_t &pwater, S32 day_length, S32 day_offset)
{
updateParcel(INVALID_PARCEL_ID, pwater, day_length, day_offset);
}
@ -1215,19 +1215,19 @@ void LLEnvironment::onUpdateParcelAssetLoaded(LLUUID asset_id, LLSettingsBase::p
updateParcel(parcel_id, pday, day_length, day_offset);
}
void LLEnvironment::updateParcel(S32 parcel_id, LLSettingsSky::ptr_t &psky, S32 day_length, S32 day_offset)
void LLEnvironment::updateParcel(S32 parcel_id, const LLSettingsSky::ptr_t &psky, S32 day_length, S32 day_offset)
{
LLSettingsDay::ptr_t pday = createDayCycleFromEnvironment((parcel_id == INVALID_PARCEL_ID) ? ENV_REGION : ENV_PARCEL, psky);
updateParcel(parcel_id, pday, day_length, day_offset);
}
void LLEnvironment::updateParcel(S32 parcel_id, LLSettingsWater::ptr_t &pwater, S32 day_length, S32 day_offset)
void LLEnvironment::updateParcel(S32 parcel_id, const LLSettingsWater::ptr_t &pwater, S32 day_length, S32 day_offset)
{
LLSettingsDay::ptr_t pday = createDayCycleFromEnvironment((parcel_id == INVALID_PARCEL_ID) ? ENV_REGION : ENV_PARCEL, pwater);
updateParcel(parcel_id, pday, day_length, day_offset);
}
void LLEnvironment::updateParcel(S32 parcel_id, LLSettingsDay::ptr_t &pday, S32 day_length, S32 day_offset)
void LLEnvironment::updateParcel(S32 parcel_id, const LLSettingsDay::ptr_t &pday, S32 day_length, S32 day_offset)
{
std::string coroname =
LLCoros::instance().launch("LLEnvironment::coroUpdateEnvironment",

12
indra/newview/llenvironment.h
View File

@ -239,15 +239,15 @@ public:
void requestRegion();
void updateRegion(const LLUUID &asset_id, S32 day_length, S32 day_offset);
void updateRegion(LLSettingsDay::ptr_t &pday, S32 day_length, S32 day_offset);
void updateRegion(LLSettingsSky::ptr_t &psky, S32 day_length, S32 day_offset);
void updateRegion(LLSettingsWater::ptr_t &pwater, S32 day_length, S32 day_offset);
void updateRegion(const LLSettingsDay::ptr_t &pday, S32 day_length, S32 day_offset);
void updateRegion(const LLSettingsSky::ptr_t &psky, S32 day_length, S32 day_offset);
void updateRegion(const LLSettingsWater::ptr_t &pwater, S32 day_length, S32 day_offset);
void resetRegion();
void requestParcel(S32 parcel_id);
void updateParcel(S32 parcel_id, const LLUUID &asset_id, S32 day_length, S32 day_offset);
void updateParcel(S32 parcel_id, LLSettingsDay::ptr_t &pday, S32 day_length, S32 day_offset);
void updateParcel(S32 parcel_id, LLSettingsSky::ptr_t &psky, S32 day_length, S32 day_offset);
void updateParcel(S32 parcel_id, LLSettingsWater::ptr_t &pwater, S32 day_length, S32 day_offset);
void updateParcel(S32 parcel_id, const LLSettingsDay::ptr_t &pday, S32 day_length, S32 day_offset);
void updateParcel(S32 parcel_id, const LLSettingsSky::ptr_t &psky, S32 day_length, S32 day_offset);
void updateParcel(S32 parcel_id, const LLSettingsWater::ptr_t &pwater, S32 day_length, S32 day_offset);
void resetParcel(S32 parcel_id);
void selectAgentEnvironment();