aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llpanelobject.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llpanelobject.cpp')
-rw-r--r--linden/indra/newview/llpanelobject.cpp30
1 files changed, 16 insertions, 14 deletions
diff --git a/linden/indra/newview/llpanelobject.cpp b/linden/indra/newview/llpanelobject.cpp
index e4e28b8..a395d09 100644
--- a/linden/indra/newview/llpanelobject.cpp
+++ b/linden/indra/newview/llpanelobject.cpp
@@ -164,11 +164,10 @@ BOOL LLPanelObject::postBuild()
164 childSetCommitCallback("material",onCommitMaterial,this); 164 childSetCommitCallback("material",onCommitMaterial,this);
165 mComboMaterial->removeall(); 165 mComboMaterial->removeall();
166 // *TODO:translate 166 // *TODO:translate
167 LLMaterialInfo *minfop; 167 for (LLMaterialTable::info_list_t::iterator iter = LLMaterialTable::basic.mMaterialInfoList.begin();
168 for (minfop = LLMaterialTable::basic.mMaterialInfoList.getFirstData(); 168 iter != LLMaterialTable::basic.mMaterialInfoList.end(); ++iter)
169 minfop != NULL;
170 minfop = LLMaterialTable::basic.mMaterialInfoList.getNextData())
171 { 169 {
170 LLMaterialInfo* minfop = *iter;
172 if (minfop->mMCode != LL_MCODE_LIGHT) 171 if (minfop->mMCode != LL_MCODE_LIGHT)
173 { 172 {
174 mComboMaterial->add(minfop->mName); 173 mComboMaterial->add(minfop->mName);
@@ -259,7 +258,7 @@ BOOL LLPanelObject::postBuild()
259 mSpinRevolutions->setValidateBeforeCommit( &precommitValidate ); 258 mSpinRevolutions->setValidateBeforeCommit( &precommitValidate );
260 259
261 // Sculpt 260 // Sculpt
262 mCtrlSculptTexture = LLUICtrlFactory::getTexturePickerByName(this,"sculpt texture control"); 261 mCtrlSculptTexture = getChild<LLTextureCtrl>("sculpt texture control");
263 if (mCtrlSculptTexture) 262 if (mCtrlSculptTexture)
264 { 263 {
265 mCtrlSculptTexture->setDefaultImageAssetID(LLUUID(SCULPT_DEFAULT_TEXTURE)); 264 mCtrlSculptTexture->setDefaultImageAssetID(LLUUID(SCULPT_DEFAULT_TEXTURE));
@@ -913,12 +912,15 @@ void LLPanelObject::getState( )
913 mSpinScaleY->setMaxValue(OBJECT_MAX_HOLE_SIZE_Y); 912 mSpinScaleY->setMaxValue(OBJECT_MAX_HOLE_SIZE_Y);
914 break; 913 break;
915 default: 914 default:
916 mSpinScaleX->set( 1.f - scale_x ); 915 if (editable)
917 mSpinScaleY->set( 1.f - scale_y ); 916 {
918 mSpinScaleX->setMinValue(-1.f); 917 mSpinScaleX->set( 1.f - scale_x );
919 mSpinScaleX->setMaxValue(1.f); 918 mSpinScaleY->set( 1.f - scale_y );
920 mSpinScaleY->setMinValue(-1.f); 919 mSpinScaleX->setMinValue(-1.f);
921 mSpinScaleY->setMaxValue(1.f); 920 mSpinScaleX->setMaxValue(1.f);
921 mSpinScaleY->setMinValue(-1.f);
922 mSpinScaleY->setMaxValue(1.f);
923 }
922 break; 924 break;
923 } 925 }
924 926
@@ -1903,7 +1905,7 @@ void LLPanelObject::onSelectSculpt(LLUICtrl* ctrl, void* userdata)
1903{ 1905{
1904 LLPanelObject* self = (LLPanelObject*) userdata; 1906 LLPanelObject* self = (LLPanelObject*) userdata;
1905 1907
1906 LLTextureCtrl* mTextureCtrl = gUICtrlFactory->getTexturePickerByName(self, "sculpt texture control"); 1908 LLTextureCtrl* mTextureCtrl = self->getChild<LLTextureCtrl>("sculpt texture control");
1907 1909
1908 if (mTextureCtrl) 1910 if (mTextureCtrl)
1909 { 1911 {
@@ -1926,7 +1928,7 @@ BOOL LLPanelObject::onDropSculpt(LLUICtrl*, LLInventoryItem* item, void* userdat
1926{ 1928{
1927 LLPanelObject* self = (LLPanelObject*) userdata; 1929 LLPanelObject* self = (LLPanelObject*) userdata;
1928 1930
1929 LLTextureCtrl* mTextureCtrl = gUICtrlFactory->getTexturePickerByName(self, "sculpt texture control"); 1931 LLTextureCtrl* mTextureCtrl = self->getChild<LLTextureCtrl>("sculpt texture control");
1930 1932
1931 if (mTextureCtrl) 1933 if (mTextureCtrl)
1932 { 1934 {
@@ -1945,7 +1947,7 @@ void LLPanelObject::onCancelSculpt(LLUICtrl* ctrl, void* userdata)
1945{ 1947{
1946 LLPanelObject* self = (LLPanelObject*) userdata; 1948 LLPanelObject* self = (LLPanelObject*) userdata;
1947 1949
1948 LLTextureCtrl* mTextureCtrl = gUICtrlFactory->getTexturePickerByName(self,"sculpt texture control"); 1950 LLTextureCtrl* mTextureCtrl = self->getChild<LLTextureCtrl>("sculpt texture control");
1949 if(!mTextureCtrl) 1951 if(!mTextureCtrl)
1950 return; 1952 return;
1951 1953