diff options
| author | CG Linden <cg@lindenlab.com> | 2010-01-29 16:29:12 -0800 |
|---|---|---|
| committer | CG Linden <cg@lindenlab.com> | 2010-01-29 16:29:12 -0800 |
| commit | f6a59081a7959e21f952a93bc3809315f2fa361e (patch) | |
| tree | d77373c86810e505892cfb483001fe535201db46 /indra/newview/llpanelobject.cpp | |
| parent | b8856efd5ff0e4899bb369dfd0815e824cd3a432 (diff) | |
| parent | 682f8afcc073b62fed64a3fd2adc5f65793e1f3e (diff) | |
Merge in latest viewer-2-0 changes.
Diffstat (limited to 'indra/newview/llpanelobject.cpp')
| -rw-r--r-- | indra/newview/llpanelobject.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp index d17c287cc7..30221da12a 100644 --- a/indra/newview/llpanelobject.cpp +++ b/indra/newview/llpanelobject.cpp @@ -316,11 +316,14 @@ BOOL LLPanelObject::postBuild() LLPanelObject::LLPanelObject() : LLPanel(), + mComboMaterialItemCount(0), mIsPhysical(FALSE), mIsTemporary(FALSE), mIsPhantom(FALSE), mCastShadows(TRUE), - mSelectedType(MI_BOX) + mSelectedType(MI_BOX), + mSculptTextureRevert(LLUUID::null), + mSculptTypeRevert(0) { } |