summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelobject.cpp
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2010-01-27 15:06:53 +0200
committerVadim Savchuk <vsavchuk@productengine.com>2010-01-27 15:06:53 +0200
commitd3d2a8d537bf1542c152afdb239f7021ebdbe78f (patch)
tree602b749a5e2c13384b27a69a845b782449f96748 /indra/newview/llpanelobject.cpp
parentb68ccadd46d2ff094147ffd72318fd3a728c28eb (diff)
parent86cab299b01081c8c89587fd72d81460318e4ec1 (diff)
Merge from default branch
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llpanelobject.cpp')
-rw-r--r--indra/newview/llpanelobject.cpp5
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)
{
}