summaryrefslogtreecommitdiff
path: root/indra/newview/llfeaturemanager.cpp
diff options
context:
space:
mode:
authorandreykproductengine <andreykproductengine@lindenlab.com>2017-08-25 20:26:25 +0300
committerandreykproductengine <andreykproductengine@lindenlab.com>2017-08-25 20:26:25 +0300
commitc21b3bbaccdad847611c5af78f612a3db2f47cc1 (patch)
tree802f84fa8c1b81f45d6f62c15fb353264d797651 /indra/newview/llfeaturemanager.cpp
parente46f66ff31607d7580be3cae3fef9d070b9ba0d0 (diff)
MAINT-7739 Make LLOSInfo a Singleton
Diffstat (limited to 'indra/newview/llfeaturemanager.cpp')
-rw-r--r--indra/newview/llfeaturemanager.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp
index d4ba230feb..ae4ce298a0 100644
--- a/indra/newview/llfeaturemanager.cpp
+++ b/indra/newview/llfeaturemanager.cpp
@@ -486,7 +486,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)
@@ -767,7 +767,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");