summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2018-06-05 11:19:22 -0700
committerRider Linden <rider@lindenlab.com>2018-06-05 11:19:22 -0700
commit610a793aa8fb9f918fc25eeab02b7415ac18b33b (patch)
treea338e3b4c5f6210c8ad1df9980c2a3f6b2a280bb /indra
parent6ea2847b58164f0ea315f7b2b9c34e663a07e60e (diff)
EOL in llsetingssky.cpp and llrender.cpp. const on ptr_t & in llenvironment
Diffstat (limited to 'indra')
-rw-r--r--indra/llinventory/llsettingssky.cpp2
-rw-r--r--indra/llrender/llrender.cpp2
-rw-r--r--indra/newview/llenvironment.cpp12
-rw-r--r--indra/newview/llenvironment.h12
4 files changed, 14 insertions, 14 deletions
diff --git a/indra/llinventory/llsettingssky.cpp b/indra/llinventory/llsettingssky.cpp
index a6f0d06e7d..263e721d00 100644
--- a/indra/llinventory/llsettingssky.cpp
+++ b/indra/llinventory/llsettingssky.cpp
@@ -1052,4 +1052,4 @@ void LLSettingsSky::calculateLightSettings() const
LLUUID LLSettingsSky::GetDefaultAssetId()
{
return DEFAULT_ASSET_ID;
-} \ No newline at end of file
+}
diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp
index 5e16aded30..c42d2799d7 100644
--- a/indra/llrender/llrender.cpp
+++ b/indra/llrender/llrender.cpp
@@ -2436,4 +2436,4 @@ glh::matrix4f gl_lookat(LLVector3 eye, LLVector3 center, LLVector3 up)
-f[0], -f[1], -f[2], 0,
0, 0, 0, 1);
-} \ No newline at end of file
+}
diff --git a/indra/newview/llenvironment.cpp b/indra/newview/llenvironment.cpp
index 097b229587..02d79b2bae 100644
--- a/indra/newview/llenvironment.cpp
+++ b/indra/newview/llenvironment.cpp
@@ -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",
diff --git a/indra/newview/llenvironment.h b/indra/newview/llenvironment.h
index 66950b0625..8202564ce7 100644
--- a/indra/newview/llenvironment.h
+++ b/indra/newview/llenvironment.h
@@ -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();