From 943f77eed02a77dcc8f896df784cc26f71179af7 Mon Sep 17 00:00:00 2001 From: Inusaito Sayori Date: Sun, 10 Nov 2013 19:12:20 -0500 Subject: [PATCH] Fix the UI Warnings in LLFloaterModelPreview Adds the green check and red x icons Adds Price Breakdown text to the mesh upload floater, quite useful! Removes useless ui element references in only code Comments out ui element references in only code that we don't have and don't have a clear place --- indra/newview/llfloatermodelpreview.cpp | 13 +++++-------- .../skins/default/textures/green_checkmark.png | Bin 0 -> 414 bytes indra/newview/skins/default/textures/red_x.png | Bin 0 -> 624 bytes .../default/xui/en-us/floater_model_preview.xml | 5 ++++- 4 files changed, 9 insertions(+), 9 deletions(-) create mode 100644 indra/newview/skins/default/textures/green_checkmark.png create mode 100644 indra/newview/skins/default/textures/red_x.png 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 0000000000000000000000000000000000000000..d2a5b348dc2cacf8506311b03287d71a75a913b9 GIT binary patch literal 414 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!WQl7;NpOBzNqJ&XDuZK6ep0G} zXKrG8YEWuoN@d~6R2!h8>Hwb*S8aVwZ9Oe*9WCu-32iGitw|i(hML+@(pt+IwMvDw znt8RuWV9ABX?1gHEo9bO%BY<#rfs37?X93Sk40+&hgP|uw!5NsxQw=olGbcitv*hz z4sLB{Wo=tk?HDO-M`djj4Q*>xZ6gh>IV@U}*|l1Ev^^BHRxtek|9?+=VL8wlnk7Mg z!9XrifFbCMLOW1Xi>HfYNX4y?b2r7B40v2GZb@Ymos%ANq5A)SZr)uJZfxH?xhyoJ ze|_}ExpM>}J<=K?G#D(Hx0=o3Ja>~}xBQQ-&y;HJ?RY-VXY2FmAjJ@kmwdOX=bn1H zV(|>e@6!*5ChiK-w0>|(f5XN9AqU!&1Lp0ze43?%b(1*n2f^omnBBGu-ecln_#mXX V#{Z_pDWH28JYD@<);T3K0RT$>qxt{< literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..a61202f09bd654c50e2706748b7302670fdcf289 GIT binary patch literal 624 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!WQl7;NpOBzNqJ&XDuZK6ep0G} zXKrG8YEWuoN@d~6R2!h8Zvj3buD=-=%+1WcGcf4t>V9KjIN{*%gMq=`&d%D(($>cM zF9X9_Q?mnh_7>*mhwL481O?vG(z3U+IpXYm($@Af1B0=#v758wZfEC<`i6(>9M=2$ zTUwZ}^7mUB8r%^QeA3?WilI?QMCcL!09Qwcr!q3Fp+Rc`0#=6v*w|P*IoRpz>xcMw zpRu(K_Vw1&)4QT?aLC?qlb_GBz<|%Zyb<1B>jM1_J2@H|8XmT{UlSI7$=KM@-rmv9 z?h_mP2?u*8dwT-|gO6O?#~huWNJyMBGOdq|_H=V`a0*1A^JcU5hH+i}^hE&{&>A%i*$biT7 zauC;+H+#R|tA1}Q{QG}>o0$to;rutrFXd)Fi04T9r 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]