diff options
| author | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-03-06 17:42:54 +0000 |
|---|---|---|
| committer | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-03-06 17:42:54 +0000 |
| commit | 7ba03ede49a0850016c0b3f97863c0ec9944b251 (patch) | |
| tree | 3e71dc5ffa6b033cf12afef1f4190ee14bba4021 /indra | |
| parent | 5517eb3f6f06226fba0ffe510334f519a8a7d7b7 (diff) | |
Modify use of linkable shader from libatmosphere.
Update to use latest 3p-libatmo build packages.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llrender/llatmosphere.cpp | 2 | ||||
| -rw-r--r-- | indra/llrender/llatmosphere.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llrender/llatmosphere.cpp b/indra/llrender/llatmosphere.cpp index a8557e82da..6ce5292839 100644 --- a/indra/llrender/llatmosphere.cpp +++ b/indra/llrender/llatmosphere.cpp @@ -215,7 +215,7 @@ LLGLTexture* LLAtmosphere::getMieScattering() const return m_mie_scattering; } -GLuint LLAtmosphere::getAtmosphericShaderForLink() const +GLhandleARB LLAtmosphere::getAtmosphericShaderForLink() const { return m_model ? m_model->GetShader() : 0; } diff --git a/indra/llrender/llatmosphere.h b/indra/llrender/llatmosphere.h index 4aa36be27f..6a9d1a4438 100644 --- a/indra/llrender/llatmosphere.h +++ b/indra/llrender/llatmosphere.h @@ -50,7 +50,7 @@ public: LLGLTexture* getScattering() const; LLGLTexture* getMieScattering() const; - GLuint getAtmosphericShaderForLink() const; + GLhandleARB getAtmosphericShaderForLink() const; protected: LLAtmosphere(const LLAtmosphere& rhs) |