diff options
author | pavelkproductengine <pavelkproductengine@lindenlab.com> | 2016-04-05 17:44:53 +0300 |
---|---|---|
committer | pavelkproductengine <pavelkproductengine@lindenlab.com> | 2016-04-05 17:44:53 +0300 |
commit | 808b8ed01849fc6e2cd5caba68843eebcadc5333 (patch) | |
tree | 5ec918dec9991023fe2bc359eda3d8172b2ff03f /indra/newview/lloutfitslist.cpp | |
parent | 4f27522175ce2be03cf7ef4673fcc57e29d88554 (diff) |
MAINT-6228 Update Photo/Image Upload feature for Outfit Browser
1) Added "Select Photo" to outfit gear menu
2) Incorporated Texture Picker
Diffstat (limited to 'indra/newview/lloutfitslist.cpp')
-rwxr-xr-x | indra/newview/lloutfitslist.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/indra/newview/lloutfitslist.cpp b/indra/newview/lloutfitslist.cpp index a7636fc368..b657d2e285 100755 --- a/indra/newview/lloutfitslist.cpp +++ b/indra/newview/lloutfitslist.cpp @@ -1091,7 +1091,8 @@ LLOutfitListGearMenuBase::LLOutfitListGearMenuBase(LLOutfitListBase* olist) registrar.add("Gear.WearAdd", boost::bind(&LLOutfitListGearMenuBase::onAdd, this)); registrar.add("Gear.UploadPhoto", boost::bind(&LLOutfitListGearMenuBase::onUploadFoto, this)); - + registrar.add("Gear.SelectPhoto", boost::bind(&LLOutfitListGearMenuBase::onSelectPhoto, this)); + enable_registrar.add("Gear.OnEnable", boost::bind(&LLOutfitListGearMenuBase::onEnable, this, _2)); enable_registrar.add("Gear.OnVisible", boost::bind(&LLOutfitListGearMenuBase::onVisible, this, _2)); @@ -1229,6 +1230,11 @@ void LLOutfitListGearMenuBase::onUploadFoto() } +void LLOutfitListGearMenuBase::onSelectPhoto() +{ + +} + LLOutfitListGearMenu::LLOutfitListGearMenu(LLOutfitListBase* olist) : LLOutfitListGearMenuBase(olist) {} @@ -1242,7 +1248,7 @@ void LLOutfitListGearMenu::onUpdateItemsVisibility() mMenu->setItemVisible("expand", TRUE); mMenu->setItemVisible("collapse", TRUE); mMenu->setItemVisible("upload_photo", FALSE); - mMenu->setItemVisible("load_assets", TRUE); + mMenu->setItemVisible("select_photo", FALSE); LLOutfitListGearMenuBase::onUpdateItemsVisibility(); } |