summaryrefslogtreecommitdiff
path: root/indra/llappearance/lllocaltextureobject.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2018-08-21 19:15:16 -0400
committerNat Goodspeed <nat@lindenlab.com>2018-08-21 19:15:16 -0400
commit6a6114568687a67dc1e2de4fd1e8a3bed605c94d (patch)
tree9d78619f4187ac9c42b8c8772c250e85fe84be85 /indra/llappearance/lllocaltextureobject.cpp
parent6f54add8a8852c8f3df86abebe38ef0ce4a6742c (diff)
parent7b83e8cdf742f800e0e7e59a9aae0ce870a6cc9b (diff)
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/llappearance/lllocaltextureobject.cpp')
-rw-r--r--indra/llappearance/lllocaltextureobject.cpp1
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;
}
-