diff options
| -rw-r--r-- | indra/newview/lloutfitgallery.cpp | 8 | ||||
| -rwxr-xr-x | indra/newview/lloutfitslist.cpp | 4 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/menu_outfit_gear.xml | 6 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_outfit_gallery.xml | 4 |
4 files changed, 11 insertions, 11 deletions
diff --git a/indra/newview/lloutfitgallery.cpp b/indra/newview/lloutfitgallery.cpp index 92827a7b6f..c1017d4cc0 100644 --- a/indra/newview/lloutfitgallery.cpp +++ b/indra/newview/lloutfitgallery.cpp @@ -544,7 +544,7 @@ void LLOutfitGalleryGearMenu::onUpdateItemsVisibility() if (!mMenu) return; mMenu->setItemVisible("expand", FALSE); mMenu->setItemVisible("collapse", FALSE); - mMenu->setItemVisible("upload_foto", TRUE); + mMenu->setItemVisible("upload_photo", TRUE); mMenu->setItemVisible("load_assets", TRUE); LLOutfitListGearMenuBase::onUpdateItemsVisibility(); } @@ -736,9 +736,9 @@ void LLOutfitGallery::uploadPhoto(LLUUID outfit_id) checkRemovePhoto(outfit_id); - LLStringUtil::format_map_t foto_string_args; - foto_string_args["OUTFIT_NAME"] = outfit_cat->getName(); - std::string display_name = getString("outfit_foto_string", foto_string_args); + LLStringUtil::format_map_t photo_string_args; + photo_string_args["OUTFIT_NAME"] = outfit_cat->getName(); + std::string display_name = getString("outfit_photo_string", photo_string_args); upload_new_resource(filename, // file display_name, diff --git a/indra/newview/lloutfitslist.cpp b/indra/newview/lloutfitslist.cpp index 736da5d411..00fa439e8f 100755 --- a/indra/newview/lloutfitslist.cpp +++ b/indra/newview/lloutfitslist.cpp @@ -1324,7 +1324,7 @@ LLOutfitListGearMenuBase::LLOutfitListGearMenuBase(LLOutfitListBase* olist) registrar.add("Gear.WearAdd", boost::bind(&LLOutfitListGearMenuBase::onAdd, this)); - registrar.add("Gear.UploadFoto", boost::bind(&LLOutfitListGearMenuBase::onUploadFoto, this)); + registrar.add("Gear.UploadPhoto", boost::bind(&LLOutfitListGearMenuBase::onUploadFoto, this)); registrar.add("Gear.LoadAssets", boost::bind(&LLOutfitListGearMenuBase::onLoadAssets, this)); enable_registrar.add("Gear.OnEnable", boost::bind(&LLOutfitListGearMenuBase::onEnable, this, _2)); @@ -1477,7 +1477,7 @@ void LLOutfitListGearMenu::onUpdateItemsVisibility() if (!mMenu) return; mMenu->setItemVisible("expand", TRUE); mMenu->setItemVisible("collapse", TRUE); - mMenu->setItemVisible("upload_foto", FALSE); + mMenu->setItemVisible("upload_photo", FALSE); mMenu->setItemVisible("load_assets", TRUE); LLOutfitListGearMenuBase::onUpdateItemsVisibility(); } diff --git a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml index c970efbc03..3132c4db8b 100755 --- a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml +++ b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml @@ -40,11 +40,11 @@ parameter="take_off" /> </menu_item_call> <menu_item_call - label="Upload foto" + label="Upload Photo (L$10)" layout="topleft" - name="upload_foto"> + name="upload_photo"> <on_click - function="Gear.UploadFoto" /> + function="Gear.UploadPhoto" /> </menu_item_call> <menu_item_call label="Load assets" diff --git a/indra/newview/skins/default/xui/en/panel_outfit_gallery.xml b/indra/newview/skins/default/xui/en/panel_outfit_gallery.xml index 2a06b35942..c06c6a86c3 100644 --- a/indra/newview/skins/default/xui/en/panel_outfit_gallery.xml +++ b/indra/newview/skins/default/xui/en/panel_outfit_gallery.xml @@ -10,8 +10,8 @@ left="0" top="0" width="312"> - <string name="outfit_foto_string"> - Foto of "[OUTFIT_NAME]" outfit + <string name="outfit_photo_string"> + Photo of "[OUTFIT_NAME]" outfit </string> <scroll_container border="true" |