diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp index 3520b56e1..1902f115d 100644 --- a/indra/newview/llfloatermodelpreview.cpp +++ b/indra/newview/llfloatermodelpreview.cpp @@ -726,8 +726,10 @@ void LLFloaterModelPreview::draw() } } + /* Singu Note: Dummy views and what for? childSetTextArg("prim_cost", "[PRIM_COST]", llformat("%d", mModelPreview->mResourceCost)); childSetTextArg("description_label", "[TEXTURES]", llformat("%d", mModelPreview->mTextureSet.size())); + */ if (mModelPreview) { @@ -1155,7 +1157,7 @@ void LLFloaterModelPreview::initDecompControls() mDecompParams[param[i].mName] = LLSD(param[i].mDefault.mBool); //llinfos << "Type: boolean, Default: " << (param[i].mDefault.mBool ? "True" : "False") << llendl; - LLCheckBoxCtrl* check_box = getChild(name); + LLCheckBoxCtrl* check_box = findChild(name); if (check_box) { check_box->setValue(param[i].mDefault.mBool); @@ -3710,7 +3712,6 @@ void LLModelPreview::loadModelCallback(S32 lod) mLoading = false; if (mFMP) { - mFMP->getChild("confirm_checkbox")->set(FALSE); if (!mBaseModel.empty()) { if (mFMP->getChild("description_form")->getValue().asString().empty()) @@ -4193,7 +4194,9 @@ void LLModelPreview::updateStatusMessages() } } + /* Singu Note: Dummy views and what for? mFMP->childSetTextArg("submeshes_info", "[SUBMESHES]", llformat("%d", total_submeshes[LLModel::LOD_HIGH])); + */ std::string mesh_status_na = mFMP->getString("mesh_status_na"); @@ -5524,12 +5527,6 @@ void LLModelPreview::setPreviewLOD(S32 lod) combo_box->setCurrentByIndex((NUM_LOD-1)-mPreviewLOD); // combo box list of lods is in reverse order mFMP->childSetText("lod_file_" + lod_name[mPreviewLOD], mLODFile[mPreviewLOD]); - LLComboBox* combo_box2 = mFMP->getChild("preview_lod_combo2"); - combo_box2->setCurrentByIndex((NUM_LOD-1)-mPreviewLOD); // combo box list of lods is in reverse order - - LLComboBox* combo_box3 = mFMP->getChild("preview_lod_combo3"); - combo_box3->setCurrentByIndex((NUM_LOD-1)-mPreviewLOD); // combo box list of lods is in reverse order - LLColor4 highlight_color = LLUI::sColorsGroup->getColor("MeshImportTableHighlightColor"); LLColor4 normal_color = LLUI::sColorsGroup->getColor("MeshImportTableNormalColor"); diff --git a/indra/newview/skins/default/textures/green_checkmark.png b/indra/newview/skins/default/textures/green_checkmark.png new file mode 100644 index 000000000..d2a5b348d Binary files /dev/null and b/indra/newview/skins/default/textures/green_checkmark.png differ diff --git a/indra/newview/skins/default/textures/red_x.png b/indra/newview/skins/default/textures/red_x.png new file mode 100644 index 000000000..a61202f09 Binary files /dev/null and b/indra/newview/skins/default/textures/red_x.png differ diff --git a/indra/newview/skins/default/xui/en-us/floater_model_preview.xml b/indra/newview/skins/default/xui/en-us/floater_model_preview.xml index 62f5af6e1..ef73295c5 100644 --- a/indra/newview/skins/default/xui/en-us/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/en-us/floater_model_preview.xml @@ -536,6 +536,9 @@ left_delta="100" bottom_delta="0" height="16" width="90"> Server: [SIM] + + Price Breakdown: Streaming: [CURRENCY] [STREAMING] Physics: [CURRENCY] [PHYSICS] Instances: [CURRENCY] [INSTANCES] Textures: [CURRENCY] [TEXTURES] Model: [CURRENCY] [MODEL] + + left="5" bottom_delta="-18" height="16" width="615"> [STATUS]