summaryrefslogtreecommitdiff
path: root/indra/llappearance
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2018-10-17 10:31:59 -0400
committerNat Goodspeed <nat@lindenlab.com>2018-10-17 10:31:59 -0400
commit036c52fcdf425fe79a9aa6682cd7c7fe709a2442 (patch)
tree80b637dd5876fa63fa247567aa5c267cfaf10441 /indra/llappearance
parent3abc0095c9e39faf8976ef815b0da656423c4905 (diff)
parentbffe112cf5a1b9dd8acf5146c733a0fe186f6e89 (diff)
Automated merge with ssh://bitbucket.org/nat_linden/viewer-poseidon
Diffstat (limited to 'indra/llappearance')
-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;
}
-