diff options
Diffstat (limited to 'indra/newview/llpanelobject.cpp')
| -rw-r--r-- | indra/newview/llpanelobject.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp index f0acbf4b22..1ad71075ae 100644 --- a/indra/newview/llpanelobject.cpp +++ b/indra/newview/llpanelobject.cpp @@ -164,11 +164,10 @@ BOOL LLPanelObject::postBuild() childSetCommitCallback("material",onCommitMaterial,this); mComboMaterial->removeall(); // *TODO:translate - LLMaterialInfo *minfop; - for (minfop = LLMaterialTable::basic.mMaterialInfoList.getFirstData(); - minfop != NULL; - minfop = LLMaterialTable::basic.mMaterialInfoList.getNextData()) + for (LLMaterialTable::info_list_t::iterator iter = LLMaterialTable::basic.mMaterialInfoList.begin(); + iter != LLMaterialTable::basic.mMaterialInfoList.end(); ++iter) { + LLMaterialInfo* minfop = *iter; if (minfop->mMCode != LL_MCODE_LIGHT) { mComboMaterial->add(minfop->mName); |