diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2018-11-14 16:17:36 -0500 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2018-11-14 16:17:36 -0500 |
commit | f7e99f0db7f9fb52f8001e536f95ec898740631e (patch) | |
tree | 4f6048435c619a14dd0108bb835068098776874d /indra/llappearance | |
parent | 8558ce5c600b810356010ba3cd6d534ef22f4081 (diff) | |
parent | 4e776c522cb4ba49a5b833d4b9164ab8c48f4b9b (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; } - |