summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2017-05-30 15:59:23 +0100
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2017-05-30 15:59:23 +0100
commit4d68945595227b0f863a1c496be5da0f3c3c5113 (patch)
tree85fa9f955e225e71e5ecc9317a44201b82aefb29
parent7691780825940364e3faa7a682490f51491d44dc (diff)
SL-694 - UI initialization, set mType in LLExtendedMeshParams constructor
-rw-r--r--indra/llprimitive/llprimitive.cpp1
-rw-r--r--indra/newview/llpanelvolume.cpp1
2 files changed, 2 insertions, 0 deletions
diff --git a/indra/llprimitive/llprimitive.cpp b/indra/llprimitive/llprimitive.cpp
index 54b87fec78..c847cf653f 100644
--- a/indra/llprimitive/llprimitive.cpp
+++ b/indra/llprimitive/llprimitive.cpp
@@ -2033,6 +2033,7 @@ bool LLLightImageParams::fromLLSD(LLSD& sd)
LLExtendedMeshParams::LLExtendedMeshParams()
{
+ mType = PARAMS_EXTENDED_MESH;
mFlags = 0;
}
diff --git a/indra/newview/llpanelvolume.cpp b/indra/newview/llpanelvolume.cpp
index 423d0a8d88..58cbede57b 100644
--- a/indra/newview/llpanelvolume.cpp
+++ b/indra/newview/llpanelvolume.cpp
@@ -597,6 +597,7 @@ void LLPanelVolume::clearCtrls()
getChildView("Light Radius")->setEnabled(false);
getChildView("Light Falloff")->setEnabled(false);
+ getChildView("Animated Mesh Checkbox Ctrl")->setEnabled(false);
getChildView("Flexible1D Checkbox Ctrl")->setEnabled(false);
getChildView("FlexNumSections")->setEnabled(false);
getChildView("FlexGravity")->setEnabled(false);