summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterfixedenvironment.cpp
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2018-09-17 14:21:38 -0700
committerRider Linden <rider@lindenlab.com>2018-09-17 14:21:38 -0700
commit17fb7d0bf4cc4db1c3f30dbbbdee7610d168336c (patch)
treeb3b48dcbe06af0df45696245bdc4639cdc346a27 /indra/newview/llfloaterfixedenvironment.cpp
parent53a93d3e73892f633b1d79de359924d733489bdb (diff)
SL-9667, SL-9669: Do not attempt to request environment for non-eep parcels, use handle to panel passed to static for callbacks.
Diffstat (limited to 'indra/newview/llfloaterfixedenvironment.cpp')
-rw-r--r--indra/newview/llfloaterfixedenvironment.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterfixedenvironment.cpp b/indra/newview/llfloaterfixedenvironment.cpp
index 45662cb37b..9831a5fa84 100644
--- a/indra/newview/llfloaterfixedenvironment.cpp
+++ b/indra/newview/llfloaterfixedenvironment.cpp
@@ -586,7 +586,7 @@ void LLFloaterFixedEnvironmentWater::doImportFromDisk()
void LLFloaterFixedEnvironmentWater::loadWaterSettingFromFile(const std::vector<std::string>& filenames)
{
- if (filenames.size() < 1) return;
+ if (filenames.size() < 1) return;
std::string filename = filenames[0];
LL_WARNS("LAPRAS") << "Selected file: " << filename << LL_ENDL;
LLSettingsWater::ptr_t legacywater = LLEnvironment::createWaterFromLegacyPreset(filename);
@@ -673,7 +673,7 @@ void LLFloaterFixedEnvironmentSky::doImportFromDisk()
void LLFloaterFixedEnvironmentSky::loadSkySettingFromFile(const std::vector<std::string>& filenames)
{
- if (filenames.size() < 1) return;
+ if (filenames.size() < 1) return;
std::string filename = filenames[0];
LL_WARNS("LAPRAS") << "Selected file: " << filename << LL_ENDL;