diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2016-12-08 14:27:40 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2016-12-08 14:27:40 -0500 |
| commit | b6dc755786fb06ab109eb36f402a25edaf24ce14 (patch) | |
| tree | 04f465dd42a555f15bf2729ad4a2fcea181db1c9 /indra/newview/llmaterialmgr.h | |
| parent | 5bb456d80cfbcdfe87526510f3b8297d315afdd8 (diff) | |
| parent | a65b586b184d9837e0586b4df0d2e758ccce63f6 (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-skip-llcorehttp-test
Diffstat (limited to 'indra/newview/llmaterialmgr.h')
| -rw-r--r-- | indra/newview/llmaterialmgr.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llmaterialmgr.h b/indra/newview/llmaterialmgr.h index 36dd0904b6..60b58d17de 100644 --- a/indra/newview/llmaterialmgr.h +++ b/indra/newview/llmaterialmgr.h @@ -38,9 +38,7 @@ class LLViewerRegion; class LLMaterialMgr : public LLSingleton<LLMaterialMgr> { - friend class LLSingleton<LLMaterialMgr>; -protected: - LLMaterialMgr(); + LLSINGLETON(LLMaterialMgr); virtual ~LLMaterialMgr(); public: |