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

Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer

meow-7.2.2
Ansariel 2020-11-13 18:20:46 +01:00
parent caf7f6c1d2 fb1238a1ce
commit 4fd188150b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llenvironment.cpp
View File

@ -1242,7 +1242,7 @@ void LLEnvironment::setEnvironment(LLEnvironment::EnvSelection_t env, LLEnvironm
}
else if (!environment->getSky())
{
LL_DEBUGS("ENVIRONMENT") << "Blank sky for " << env_selection_to_string(env) << ". Reusing environment for sky." << LL_ENDL; if (mCurrentEnvironment->getEnvironmentSelection() != ENV_NONE)
if (mCurrentEnvironment->getEnvironmentSelection() != ENV_NONE)
{
// Note: This looks suspicious. Shouldn't we assign whole day if mCurrentEnvironment has whole day?
// and then add water/sky on top
@ -1284,7 +1284,7 @@ void LLEnvironment::setEnvironment(LLEnvironment::EnvSelection_t env, LLEnvironm
}
else if (!environment->getWater())
{
LL_DEBUGS("ENVIRONMENT") << "Blank water for " << env_selection_to_string(env) << ". Reusing environment for water." << LL_ENDL; if (mCurrentEnvironment->getEnvironmentSelection() != ENV_NONE)
if (mCurrentEnvironment->getEnvironmentSelection() != ENV_NONE)
{
// Note: This looks suspicious. Shouldn't we assign whole day if mCurrentEnvironment has whole day?
// and then add water/sky on top