diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2019-08-20 12:50:43 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2019-08-20 12:50:43 -0400 |
commit | d13b4d18030ec5748adf7960a3a5ce367440f96e (patch) | |
tree | 7cb6467f76358ef9922ff22266be8f85d1df0389 /indra/newview | |
parent | be7713cab26032d6f5f6a739122d955df0955092 (diff) | |
parent | 5b5eb55f0c999a55cd0df1dd983629967d447b6c (diff) |
Automated merge with ssh://bitbucket.org/andreykproductengine/drtvwr-493
Diffstat (limited to 'indra/newview')
-rw-r--r-- | indra/newview/llimagefiltersmanager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llimagefiltersmanager.cpp b/indra/newview/llimagefiltersmanager.cpp index ee6b39efac..c23cdc8103 100644 --- a/indra/newview/llimagefiltersmanager.cpp +++ b/indra/newview/llimagefiltersmanager.cpp @@ -48,7 +48,7 @@ LLImageFiltersManager::~LLImageFiltersManager() { } -// virtual static +// virtual void LLImageFiltersManager::initSingleton() { loadAllFilters(); |