diff options
| author | Rider Linden <rider@lindenlab.com> | 2019-01-23 14:12:29 -0800 | 
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2019-01-23 14:12:29 -0800 | 
| commit | a7570ae344cd4e2aeaf49b7770aa8a5e14d53863 (patch) | |
| tree | f7cbe8f1f941db6a3898e4158d344b02b3b7bdec /indra | |
| parent | 618af868db91cd1a394541c4bc9afb52458202d7 (diff) | |
More specifics OSX compile.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llenvironment.cpp | 10 | 
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llenvironment.cpp b/indra/newview/llenvironment.cpp index 2f92ac8c72..26e025773a 100644 --- a/indra/newview/llenvironment.cpp +++ b/indra/newview/llenvironment.cpp @@ -435,9 +435,9 @@ namespace                  this->mSettings[(*ito).first] = (*ito).second;              } -            const LLSettingsBase::stringset_t &slerps = getSlerpKeys(); -            const LLSettingsBase::stringset_t &skips = getSkipInterpolateKeys(); -            const LLSettingsBase::stringset_t &specials = getSpecialKeys(); +            const LLSettingsBase::stringset_t &slerps = this->getSlerpKeys(); +            const LLSettingsBase::stringset_t &skips = this->getSkipInterpolateKeys(); +            const LLSettingsBase::stringset_t &specials = this->getSpecialKeys();              typename injections_t::iterator it;              for (it = mInjections.begin(); it != mInjections.end(); ++it) @@ -474,7 +474,7 @@ namespace                  }                  else if (skips.find(key_name) == skips.end())                  { -                    this->mSettings[key_name] = interpolateSDValue(key_name, value, target, getParameterMap(), mix, slerps); +                    this->mSettings[key_name] = this->interpolateSDValue(key_name, value, target, this->getParameterMap(), mix, slerps);  //                     LL_WARNS("LAPRAS") << "...blending '" << key_name << "' by " << mix << "% now=" << mSettings[key_name] << LL_ENDL;                  }              } @@ -491,7 +491,7 @@ namespace              SETTINGT::updateSettings();              if (!mInjections.empty()) -                setDirtyFlag(true); +                this->setDirtyFlag(true);          }          LLSettingsBase::stringset_t getSpecialKeys() const;  | 
