diff options
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llatmosphere.h | 12 | ||||
| -rw-r--r-- | indra/llrender/llvertexbuffer.h | 12 |
2 files changed, 4 insertions, 20 deletions
diff --git a/indra/llrender/llatmosphere.h b/indra/llrender/llatmosphere.h index 4b8c7d0819..951227b41e 100644 --- a/indra/llrender/llatmosphere.h +++ b/indra/llrender/llatmosphere.h @@ -133,11 +133,8 @@ public: static void initClass(); static void cleanupClass(); - const LLAtmosphere& operator=(const LLAtmosphere& rhs) - { - LL_ERRS() << "Illegal operation!" << LL_ENDL; - return *this; - } + LLAtmosphere(const LLAtmosphere& rhs) = delete; + const LLAtmosphere& operator=(const LLAtmosphere& rhs) = delete; LLGLTexture* getTransmittance(); LLGLTexture* getScattering(); @@ -147,11 +144,6 @@ public: bool configureAtmosphericModel(AtmosphericModelSettings& settings); protected: - LLAtmosphere(const LLAtmosphere& rhs) - { - *this = rhs; - } - LLPointer<LLGLTexture> m_transmittance; LLPointer<LLGLTexture> m_scattering; LLPointer<LLGLTexture> m_mie_scatter_texture; diff --git a/indra/llrender/llvertexbuffer.h b/indra/llrender/llvertexbuffer.h index faaa6ba0f0..f24d75e41d 100644 --- a/indra/llrender/llvertexbuffer.h +++ b/indra/llrender/llvertexbuffer.h @@ -98,16 +98,8 @@ public: U32 mEnd; }; - LLVertexBuffer(const LLVertexBuffer& rhs) - { - *this = rhs; - } - - const LLVertexBuffer& operator=(const LLVertexBuffer& rhs) - { - LL_ERRS() << "Illegal operation!" << LL_ENDL; - return *this; - } + LLVertexBuffer(const LLVertexBuffer& rhs) = delete; + const LLVertexBuffer& operator=(const LLVertexBuffer& rhs) = delete; static void initClass(LLWindow* window); static void cleanupClass(); |
