From 3a47555dc27ffa74f5427e0ef44fa25b505f6c16 Mon Sep 17 00:00:00 2001 From: leyla_linden Date: Wed, 12 Jan 2011 13:38:47 -0800 Subject: SH-777 Wizard top buttons need to be clickable and switch between wizard steps --- indra/newview/llfloatermodelpreview.cpp | 2 + indra/newview/llfloatermodelpreview.h | 5 +- indra/newview/llfloatermodelwizard.cpp | 121 ++++++++++++++++----- indra/newview/llfloatermodelwizard.h | 7 +- .../skins/default/textures/icons/check_mark.png | Bin 0 -> 3166 bytes .../default/textures/model_wizard/check_mark.png | Bin 3166 -> 0 bytes .../default/textures/model_wizard/divider_line.png | Bin 0 -> 2815 bytes .../textures/model_wizard/left_button_disabled.png | Bin 3576 -> 0 bytes .../textures/model_wizard/left_button_off.png | Bin 4309 -> 0 bytes .../textures/model_wizard/left_button_over.png | Bin 4272 -> 0 bytes .../textures/model_wizard/left_button_press.png | Bin 4278 -> 0 bytes .../model_wizard/middle_button_disabled.png | Bin 3425 -> 0 bytes .../textures/model_wizard/middle_button_off.png | Bin 4151 -> 0 bytes .../textures/model_wizard/middle_button_over.png | Bin 4137 -> 0 bytes .../textures/model_wizard/middle_button_press.png | Bin 4200 -> 0 bytes .../model_wizard/right_button_disabled.png | Bin 3169 -> 0 bytes .../textures/model_wizard/right_button_off.png | Bin 3845 -> 0 bytes .../textures/model_wizard/right_button_over.png | Bin 3867 -> 0 bytes .../textures/model_wizard/right_button_press.png | Bin 3915 -> 0 bytes indra/newview/skins/default/textures/textures.xml | 18 ++- .../widgets/BreadCrumbBtn_Left_Disabled.png | Bin 0 -> 3576 bytes .../textures/widgets/BreadCrumbBtn_Left_Off.png | Bin 0 -> 4309 bytes .../textures/widgets/BreadCrumbBtn_Left_Over.png | Bin 0 -> 4272 bytes .../textures/widgets/BreadCrumbBtn_Left_Press.png | Bin 0 -> 4278 bytes .../widgets/BreadCrumbBtn_Middle_Disabled.png | Bin 0 -> 3425 bytes .../textures/widgets/BreadCrumbBtn_Middle_Off.png | Bin 0 -> 4151 bytes .../textures/widgets/BreadCrumbBtn_Middle_Over.png | Bin 0 -> 4137 bytes .../widgets/BreadCrumbBtn_Middle_Press.png | Bin 0 -> 4200 bytes .../widgets/BreadCrumbBtn_Right_Disabled.png | Bin 0 -> 3169 bytes .../textures/widgets/BreadCrumbBtn_Right_Off.png | Bin 0 -> 3845 bytes .../textures/widgets/BreadCrumbBtn_Right_Over.png | Bin 0 -> 3867 bytes .../textures/widgets/BreadCrumbBtn_Right_Press.png | Bin 0 -> 3915 bytes .../skins/default/xui/en/floater_model_wizard.xml | 75 ++++++++----- 33 files changed, 164 insertions(+), 64 deletions(-) create mode 100644 indra/newview/skins/default/textures/icons/check_mark.png delete mode 100644 indra/newview/skins/default/textures/model_wizard/check_mark.png create mode 100644 indra/newview/skins/default/textures/model_wizard/divider_line.png delete mode 100644 indra/newview/skins/default/textures/model_wizard/left_button_disabled.png delete mode 100644 indra/newview/skins/default/textures/model_wizard/left_button_off.png delete mode 100644 indra/newview/skins/default/textures/model_wizard/left_button_over.png delete mode 100644 indra/newview/skins/default/textures/model_wizard/left_button_press.png delete mode 100644 indra/newview/skins/default/textures/model_wizard/middle_button_disabled.png delete mode 100644 indra/newview/skins/default/textures/model_wizard/middle_button_off.png delete mode 100644 indra/newview/skins/default/textures/model_wizard/middle_button_over.png delete mode 100644 indra/newview/skins/default/textures/model_wizard/middle_button_press.png delete mode 100644 indra/newview/skins/default/textures/model_wizard/right_button_disabled.png delete mode 100644 indra/newview/skins/default/textures/model_wizard/right_button_off.png delete mode 100644 indra/newview/skins/default/textures/model_wizard/right_button_over.png delete mode 100644 indra/newview/skins/default/textures/model_wizard/right_button_press.png create mode 100644 indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Left_Disabled.png create mode 100644 indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Left_Off.png create mode 100644 indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Left_Over.png create mode 100644 indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Left_Press.png create mode 100644 indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Middle_Disabled.png create mode 100644 indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Middle_Off.png create mode 100644 indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Middle_Over.png create mode 100644 indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Middle_Press.png create mode 100644 indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Right_Disabled.png create mode 100644 indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Right_Off.png create mode 100644 indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Right_Over.png create mode 100644 indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Right_Press.png diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp index 47a3a4cd30..8e08c6aa6c 100755 --- a/indra/newview/llfloatermodelpreview.cpp +++ b/indra/newview/llfloatermodelpreview.cpp @@ -2561,6 +2561,8 @@ void LLModelPreview::loadModelCallback(S32 lod) mLoading = false; refresh(); + + mModelLoadedSignal(); } void LLModelPreview::resetPreviewTarget() diff --git a/indra/newview/llfloatermodelpreview.h b/indra/newview/llfloatermodelpreview.h index 63377bb1d6..fbf6ead930 100644 --- a/indra/newview/llfloatermodelpreview.h +++ b/indra/newview/llfloatermodelpreview.h @@ -251,7 +251,8 @@ private: class LLModelPreview : public LLViewerDynamicTexture, public LLMutex { typedef boost::signals2::signal details_signal_t; - + typedef boost::signals2::signal model_loaded_signal_t; + public: LLModelPreview(S32 width, S32 height, LLFloater* fmp); virtual ~LLModelPreview(); @@ -288,6 +289,7 @@ public: static void textureLoadedCallback( BOOL success, LLViewerFetchedTexture *src_vi, LLImageRaw* src, LLImageRaw* src_aux, S32 discard_level, BOOL final, void* userdata ); boost::signals2::connection setDetailsCallback( const details_signal_t::slot_type& cb ){ return mDetailsSignal.connect(cb); } + boost::signals2::connection setModelLoadedCallback( const model_loaded_signal_t::slot_type& cb ){ return mModelLoadedSignal.connect(cb); } protected: friend class LLFloaterModelPreview; @@ -342,6 +344,7 @@ public: std::map > > mVertexBuffer[LLModel::NUM_LODS+1]; details_signal_t mDetailsSignal; + model_loaded_signal_t mModelLoadedSignal; }; diff --git a/indra/newview/llfloatermodelwizard.cpp b/indra/newview/llfloatermodelwizard.cpp index 19bdea5f44..095499e6b0 100644 --- a/indra/newview/llfloatermodelwizard.cpp +++ b/indra/newview/llfloatermodelwizard.cpp @@ -52,7 +52,14 @@ static const std::string stateNames[]={ LLFloaterModelWizard::LLFloaterModelWizard(const LLSD& key) : LLFloater(key) { + mLastEnabledState = CHOOSE_FILE; sInstance = this; + + mCommitCallbackRegistrar.add("Wizard.Choose", boost::bind(&LLFloaterModelWizard::setState, this, CHOOSE_FILE)); + mCommitCallbackRegistrar.add("Wizard.Optimize", boost::bind(&LLFloaterModelWizard::setState, this, OPTIMIZE)); + mCommitCallbackRegistrar.add("Wizard.Physics", boost::bind(&LLFloaterModelWizard::setState, this, PHYSICS)); + mCommitCallbackRegistrar.add("Wizard.Review", boost::bind(&LLFloaterModelWizard::setState, this, REVIEW)); + mCommitCallbackRegistrar.add("Wizard.Upload", boost::bind(&LLFloaterModelWizard::setState, this, UPLOAD)); } LLFloaterModelWizard::~LLFloaterModelWizard() { @@ -60,12 +67,12 @@ LLFloaterModelWizard::~LLFloaterModelWizard() } void LLFloaterModelWizard::setState(int state) { + mState = state; - setButtons(state); for(size_t t=0; t(stateNames[t]+"_panel"); + LLView *view = getChildView(stateNames[t]+"_panel"); if (view) { view->setVisible(state == (int) t ? TRUE : FALSE); @@ -74,60 +81,101 @@ void LLFloaterModelWizard::setState(int state) if (state == CHOOSE_FILE) { + mModelPreview->mViewOption["show_physics"] = false; + + getChildView("close")->setVisible(false); + getChildView("back")->setVisible(true); getChildView("back")->setEnabled(false); + getChildView("next")->setVisible(true); + getChildView("upload")->setVisible(false); + getChildView("cancel")->setVisible(true); } if (state == OPTIMIZE) { - getChildView("back")->setEnabled(true); - //mModelPreview->mModel[lod].clear(); - mModelPreview->genLODs(-1); + if (mLastEnabledState < state) + { + mModelPreview->genLODs(-1); + } + mModelPreview->mViewOption["show_physics"] = false; + + getChildView("back")->setVisible(true); + getChildView("back")->setEnabled(true); + getChildView("close")->setVisible(false); + getChildView("next")->setVisible(true); + getChildView("upload")->setVisible(false); + getChildView("cancel")->setVisible(true); } if (state == PHYSICS) { - mModelPreview->setPhysicsFromLOD(1); + if (mLastEnabledState < state) + { + mModelPreview->setPhysicsFromLOD(1); + } + mModelPreview->mViewOption["show_physics"] = true; - getChild("next")->setVisible(true); - getChild("upload")->setVisible(false); + getChildView("next")->setVisible(true); + getChildView("upload")->setVisible(false); + getChildView("close")->setVisible(false); + getChildView("back")->setVisible(true); + getChildView("back")->setEnabled(true); + getChildView("cancel")->setVisible(true); } if (state == REVIEW) { - executePhysicsStage("Decompose"); - getChild("close")->setVisible(false); - getChild("next")->setVisible(false); - getChild("back")->setVisible(true); - getChild("upload")->setVisible(true); - getChild("cancel")->setVisible(true); + if (mLastEnabledState < state) + { + executePhysicsStage("Decompose"); + } + + mModelPreview->mViewOption["show_physics"] = true; + + getChildView("close")->setVisible(false); + getChildView("next")->setVisible(false); + getChildView("back")->setVisible(true); + getChildView("back")->setEnabled(true); + getChildView("upload")->setVisible(true); + getChildView("cancel")->setVisible(true); } if (state == UPLOAD) { - getChild("close")->setVisible(true); - getChild("back")->setVisible(false); - getChild("upload")->setVisible(false); - getChild("cancel")->setVisible(false); + getChildView("close")->setVisible(true); + getChildView("next")->setVisible(false); + getChildView("back")->setVisible(false); + getChildView("upload")->setVisible(false); + getChildView("cancel")->setVisible(false); } + + updateButtons(); } -void LLFloaterModelWizard::setButtons(int state) + + +void LLFloaterModelWizard::updateButtons() { + if (mLastEnabledState < mState) + { + mLastEnabledState = mState; + } + for(size_t i=0; i(stateNames[i]+"_btn"); - if (i < state) + if (i == mState) { button->setEnabled(TRUE); - button->setToggleState(FALSE); + button->setToggleState(TRUE); } - else if (i == state) + else if (i <= mLastEnabledState) { button->setEnabled(TRUE); - button->setToggleState(TRUE); + button->setToggleState(FALSE); } else { @@ -426,7 +474,7 @@ void LLFloaterModelWizard::DecompRequest::completed() BOOL LLFloaterModelWizard::postBuild() { - LLView* preview_panel = getChild("preview_panel"); + LLView* preview_panel = getChildView("preview_panel"); childSetValue("import_scale", (F32) 0.67335826); @@ -439,19 +487,20 @@ BOOL LLFloaterModelWizard::postBuild() getChild("preview_lod_combo")->setCommitCallback(boost::bind(&LLFloaterModelWizard::onPreviewLODCommit, this, _1)); getChild("accuracy_slider")->setCommitCallback(boost::bind(&LLFloaterModelWizard::onAccuracyPerformance, this, _2)); getChild("upload")->setCommitCallback(boost::bind(&LLFloaterModelWizard::onUpload, this)); - + getChild("physics_slider")->setCommitCallback(boost::bind(&LLFloaterModelWizard::onPhysicsChanged, this)); + LLUICtrl::EnableCallbackRegistry::ScopedRegistrar enable_registrar; enable_registrar.add("Next.OnEnable", boost::bind(&LLFloaterModelWizard::onEnableNext, this)); enable_registrar.add("Back.OnEnable", boost::bind(&LLFloaterModelWizard::onEnableBack, this)); - + mPreviewRect = preview_panel->getRect(); mModelPreview = new LLModelPreview(512, 512, this); mModelPreview->setPreviewTarget(16.f); mModelPreview->setDetailsCallback(boost::bind(&LLFloaterModelWizard::setDetails, this, _1, _2, _3, _4, _5)); - + mModelPreview->setModelLoadedCallback(boost::bind(&LLFloaterModelWizard::modelLoadedCallback, this)); center(); @@ -484,6 +533,18 @@ void LLFloaterModelWizard::setDetails(F32 x, F32 y, F32 z, F32 streaming_cost, F } } +void LLFloaterModelWizard::modelLoadedCallback() +{ + mLastEnabledState = CHOOSE_FILE; + getChild("confirm_checkbox")->set(FALSE); + updateButtons(); +} + +void LLFloaterModelWizard::onPhysicsChanged() +{ + mLastEnabledState = PHYSICS; + updateButtons(); +} void LLFloaterModelWizard::onUpload() { @@ -496,7 +557,6 @@ void LLFloaterModelWizard::onUpload() } - void LLFloaterModelWizard::onAccuracyPerformance(const LLSD& data) { int val = (int) data.asInteger(); @@ -506,6 +566,7 @@ void LLFloaterModelWizard::onAccuracyPerformance(const LLSD& data) mModelPreview->refresh(); } + void LLFloaterModelWizard::onPreviewLODCommit(LLUICtrl* ctrl) { if (!mModelPreview) @@ -557,8 +618,8 @@ void LLFloaterModelWizard::draw() gGL.getTexUnit(0)->bind(mModelPreview); - LLView *view = getChild(stateNames[mState]+"_panel"); - LLView* preview_panel = view->getChild("preview_panel"); + LLView *view = getChildView(stateNames[mState]+"_panel"); + LLView* preview_panel = view->getChildView("preview_panel"); LLRect rect = preview_panel->getRect(); if (rect != mPreviewRect) diff --git a/indra/newview/llfloatermodelwizard.h b/indra/newview/llfloatermodelwizard.h index 335f4f4b56..50e4ab1a96 100644 --- a/indra/newview/llfloatermodelwizard.h +++ b/indra/newview/llfloatermodelwizard.h @@ -65,7 +65,8 @@ public: BOOL handleScrollWheel(S32 x, S32 y, S32 clicks); void setDetails(F32 x, F32 y, F32 z, F32 streaming_cost, F32 physics_cost); - + void modelLoadedCallback(); + void onPhysicsChanged(); void initDecompControls(); LLPhysicsDecomp::decomp_params mDecompParams; @@ -84,7 +85,7 @@ private: }; void setState(int state); - void setButtons(int state); + void updateButtons(); void onClickCancel(); void onClickBack(); void onClickNext(); @@ -102,6 +103,8 @@ private: S32 mLastMouseX; S32 mLastMouseY; + U32 mLastEnabledState; + }; diff --git a/indra/newview/skins/default/textures/icons/check_mark.png b/indra/newview/skins/default/textures/icons/check_mark.png new file mode 100644 index 0000000000..2c05297f4f Binary files /dev/null and b/indra/newview/skins/default/textures/icons/check_mark.png differ diff --git a/indra/newview/skins/default/textures/model_wizard/check_mark.png b/indra/newview/skins/default/textures/model_wizard/check_mark.png deleted file mode 100644 index 2c05297f4f..0000000000 Binary files a/indra/newview/skins/default/textures/model_wizard/check_mark.png and /dev/null differ diff --git a/indra/newview/skins/default/textures/model_wizard/divider_line.png b/indra/newview/skins/default/textures/model_wizard/divider_line.png new file mode 100644 index 0000000000..76c9e68767 Binary files /dev/null and b/indra/newview/skins/default/textures/model_wizard/divider_line.png differ diff --git a/indra/newview/skins/default/textures/model_wizard/left_button_disabled.png b/indra/newview/skins/default/textures/model_wizard/left_button_disabled.png deleted file mode 100644 index c7c0eaa96b..0000000000 Binary files a/indra/newview/skins/default/textures/model_wizard/left_button_disabled.png and /dev/null differ diff --git a/indra/newview/skins/default/textures/model_wizard/left_button_off.png b/indra/newview/skins/default/textures/model_wizard/left_button_off.png deleted file mode 100644 index 4a73c254fc..0000000000 Binary files a/indra/newview/skins/default/textures/model_wizard/left_button_off.png and /dev/null differ diff --git a/indra/newview/skins/default/textures/model_wizard/left_button_over.png b/indra/newview/skins/default/textures/model_wizard/left_button_over.png deleted file mode 100644 index 6fb5c432de..0000000000 Binary files a/indra/newview/skins/default/textures/model_wizard/left_button_over.png and /dev/null differ diff --git a/indra/newview/skins/default/textures/model_wizard/left_button_press.png b/indra/newview/skins/default/textures/model_wizard/left_button_press.png deleted file mode 100644 index fa18517933..0000000000 Binary files a/indra/newview/skins/default/textures/model_wizard/left_button_press.png and /dev/null differ diff --git a/indra/newview/skins/default/textures/model_wizard/middle_button_disabled.png b/indra/newview/skins/default/textures/model_wizard/middle_button_disabled.png deleted file mode 100644 index bed1a701bd..0000000000 Binary files a/indra/newview/skins/default/textures/model_wizard/middle_button_disabled.png and /dev/null differ diff --git a/indra/newview/skins/default/textures/model_wizard/middle_button_off.png b/indra/newview/skins/default/textures/model_wizard/middle_button_off.png deleted file mode 100644 index 57ce9af574..0000000000 Binary files a/indra/newview/skins/default/textures/model_wizard/middle_button_off.png and /dev/null differ diff --git a/indra/newview/skins/default/textures/model_wizard/middle_button_over.png b/indra/newview/skins/default/textures/model_wizard/middle_button_over.png deleted file mode 100644 index 2c43022f0e..0000000000 Binary files a/indra/newview/skins/default/textures/model_wizard/middle_button_over.png and /dev/null differ diff --git a/indra/newview/skins/default/textures/model_wizard/middle_button_press.png b/indra/newview/skins/default/textures/model_wizard/middle_button_press.png deleted file mode 100644 index 6b8c1baca4..0000000000 Binary files a/indra/newview/skins/default/textures/model_wizard/middle_button_press.png and /dev/null differ diff --git a/indra/newview/skins/default/textures/model_wizard/right_button_disabled.png b/indra/newview/skins/default/textures/model_wizard/right_button_disabled.png deleted file mode 100644 index 51505e80c5..0000000000 Binary files a/indra/newview/skins/default/textures/model_wizard/right_button_disabled.png and /dev/null differ diff --git a/indra/newview/skins/default/textures/model_wizard/right_button_off.png b/indra/newview/skins/default/textures/model_wizard/right_button_off.png deleted file mode 100644 index 9f93efbd93..0000000000 Binary files a/indra/newview/skins/default/textures/model_wizard/right_button_off.png and /dev/null differ diff --git a/indra/newview/skins/default/textures/model_wizard/right_button_over.png b/indra/newview/skins/default/textures/model_wizard/right_button_over.png deleted file mode 100644 index 3a4ec1a315..0000000000 Binary files a/indra/newview/skins/default/textures/model_wizard/right_button_over.png and /dev/null differ diff --git a/indra/newview/skins/default/textures/model_wizard/right_button_press.png b/indra/newview/skins/default/textures/model_wizard/right_button_press.png deleted file mode 100644 index 1f1b4c2ed5..0000000000 Binary files a/indra/newview/skins/default/textures/model_wizard/right_button_press.png and /dev/null differ diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index e69c5775f0..d351c442d3 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -73,7 +73,22 @@ with the same filename but different name - + + + + + + + + + + + + + + + + @@ -102,6 +117,7 @@ with the same filename but different name + diff --git a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Left_Disabled.png b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Left_Disabled.png new file mode 100644 index 0000000000..c7c0eaa96b Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Left_Disabled.png differ diff --git a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Left_Off.png b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Left_Off.png new file mode 100644 index 0000000000..4a73c254fc Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Left_Off.png differ diff --git a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Left_Over.png b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Left_Over.png new file mode 100644 index 0000000000..6fb5c432de Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Left_Over.png differ diff --git a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Left_Press.png b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Left_Press.png new file mode 100644 index 0000000000..fa18517933 Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Left_Press.png differ diff --git a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Middle_Disabled.png b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Middle_Disabled.png new file mode 100644 index 0000000000..bed1a701bd Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Middle_Disabled.png differ diff --git a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Middle_Off.png b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Middle_Off.png new file mode 100644 index 0000000000..57ce9af574 Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Middle_Off.png differ diff --git a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Middle_Over.png b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Middle_Over.png new file mode 100644 index 0000000000..2c43022f0e Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Middle_Over.png differ diff --git a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Middle_Press.png b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Middle_Press.png new file mode 100644 index 0000000000..6b8c1baca4 Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Middle_Press.png differ diff --git a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Right_Disabled.png b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Right_Disabled.png new file mode 100644 index 0000000000..51505e80c5 Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Right_Disabled.png differ diff --git a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Right_Off.png b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Right_Off.png new file mode 100644 index 0000000000..9f93efbd93 Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Right_Off.png differ diff --git a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Right_Over.png b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Right_Over.png new file mode 100644 index 0000000000..3a4ec1a315 Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Right_Over.png differ diff --git a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Right_Press.png b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Right_Press.png new file mode 100644 index 0000000000..1f1b4c2ed5 Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Right_Press.png differ diff --git a/indra/newview/skins/default/xui/en/floater_model_wizard.xml b/indra/newview/skins/default/xui/en/floater_model_wizard.xml index d8492a10bb..2377a9e4ef 100644 --- a/indra/newview/skins/default/xui/en/floater_model_wizard.xml +++ b/indra/newview/skins/default/xui/en/floater_model_wizard.xml @@ -18,12 +18,15 @@ enabled="false" label="5. Upload" border="false" - image_unselected="model_wizard/middle_button_off.png" - image_selected="model_wizard/middle_button_press.png" - image_hover_unselected="model_wizard/middle_button_over.png" - image_disabled="model_wizard/middle_button_disabled.png" - image_disabled_selected="model_wizard/middle_button_disabled.png" - width="110"/> + image_unselected="BreadCrumbBtn_Right_Off" + image_selected="BreadCrumbBtn_Right_Press" + image_hover_unselected="BreadCrumbBtn_Right_Over" + image_disabled="BreadCrumbBtn_Right_Disabled" + image_disabled_selected="BreadCrumbBtn_Right_Disabled" + width="110"> + +