diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2017-05-22 21:30:26 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2017-05-22 21:30:26 -0400 |
| commit | fe64db61d6f10a9b31191090e2318aebc2d53b29 (patch) | |
| tree | 635d4a6bee25c1e4ef55421f147e9e06bf5faeb3 /indra/llappearance | |
| parent | 48af8529a80052e9bc42f81f36896739f8aff861 (diff) | |
| parent | b92ab8f7e659de66140cc6f538c74c1fc81e6a73 (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/llappearance')
| -rw-r--r-- | indra/llappearance/llavatarappearance.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/llappearance/llavatarappearance.cpp b/indra/llappearance/llavatarappearance.cpp index 94c431feb4..e5089f028f 100644 --- a/indra/llappearance/llavatarappearance.cpp +++ b/indra/llappearance/llavatarappearance.cpp @@ -2125,6 +2125,3 @@ LLAvatarAppearance::LLMaskedMorph::LLMaskedMorph(LLVisualParam *morph_target, BO target->addPendingMorphMask(); } } - - - |