diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2018-09-26 16:39:16 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2018-09-26 16:39:16 -0400 |
commit | 1e8851c4dfc40fe7dc39b7b3cfae5af97f709290 (patch) | |
tree | cabe478fbe5fb3b2fce720820a43801df3c25c4c /indra/llappearance | |
parent | 58aef8beaf79dc83546a7b080014ca5030733ac8 (diff) | |
parent | 9fd463bd9496ba5d97abec6ee75b9c0c089aa69d (diff) |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/llappearance')
-rw-r--r-- | indra/llappearance/lllocaltextureobject.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/llappearance/lllocaltextureobject.cpp b/indra/llappearance/lllocaltextureobject.cpp index f49cf21512..3f564ec3de 100644 --- a/indra/llappearance/lllocaltextureobject.cpp +++ b/indra/llappearance/lllocaltextureobject.cpp @@ -210,4 +210,3 @@ void LLLocalTextureObject::setBakedReady(BOOL ready) { mIsBakedReady = ready; } - |