diff options
author | Thomas Nelson <rider@lindenlab.com> | 2017-10-17 13:38:39 -0700 |
---|---|---|
committer | Thomas Nelson <rider@lindenlab.com> | 2017-10-17 13:38:39 -0700 |
commit | 5754493cdcfeac76d0576abc19bdf5a03717780d (patch) | |
tree | e6db53ae1cd654f9b2a1a6b9ab47e01ea738ecef /indra/newview/llfeaturemanager.cpp | |
parent | cc22ffc6d799544e8f2a9dfed6813081d908c88d (diff) | |
parent | 9c5becd67d7e6fe5f696dcae8690dd562b7b0449 (diff) |
Merged lindenlab/viewer64 into default
Diffstat (limited to 'indra/newview/llfeaturemanager.cpp')
-rw-r--r-- | indra/newview/llfeaturemanager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp index 3c50810129..ce949fa1bf 100644 --- a/indra/newview/llfeaturemanager.cpp +++ b/indra/newview/llfeaturemanager.cpp @@ -496,7 +496,7 @@ void LLFeatureManager::fetchFeatureTableCoro(std::string tableName) #if LL_WINDOWS - std::string os_string = LLAppViewer::instance()->getOSInfo().getOSStringSimple(); + std::string os_string = LLOSInfo::instance().getOSStringSimple(); std::string filename; if (os_string.find("Microsoft Windows XP") == 0) @@ -777,7 +777,7 @@ void LLFeatureManager::applyBaseMasks() } #if LL_DARWIN - const LLOSInfo& osInfo = LLAppViewer::instance()->getOSInfo(); + const LLOSInfo& osInfo = LLOSInfo::instance(); if (osInfo.mMajorVer == 10 && osInfo.mMinorVer < 7) { maskFeatures("OSX_10_6_8"); |