summaryrefslogtreecommitdiff
path: root/indra/llprimitive
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2009-09-26 18:08:24 -0400
committerNat Goodspeed <nat@lindenlab.com>2009-09-26 18:08:24 -0400
commitbc4444cd78067cbf11d3ffb210375a31a33f96bd (patch)
treed9b8e78db237869e630fec6c71335d1294cec101 /indra/llprimitive
parent8ddc0c0ac43e9d10bf0262cd1ab3c0e79808fc14 (diff)
parent09bf3c1fec107e9e66514837d208ef62a6b67b91 (diff)
Merge into viewer/viewer-20 yesterday's lindenlab/svn-imports-viewer-20
Diffstat (limited to 'indra/llprimitive')
-rw-r--r--indra/llprimitive/llprimitive.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/llprimitive/llprimitive.cpp b/indra/llprimitive/llprimitive.cpp
index dcfb5cfae6..4e733ff56a 100644
--- a/indra/llprimitive/llprimitive.cpp
+++ b/indra/llprimitive/llprimitive.cpp
@@ -1908,4 +1908,3 @@ bool LLLightImageParams::fromLLSD(LLSD& sd)
return false;
}
-