summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en
AgeCommit message (Collapse)Author
2010-07-15Automated merge with ssh://richard@hg.lindenlab.com/dessie/viewer-publicRichard Linden
2010-07-15changed allow_html to parse_urls to be clearer about its meaningRichard Linden
allow_html still supported as alternate
2010-07-15merge from PE's viewer-trunk (viewer-public)Tofu Linden
2010-07-14Merged from viewer-releaseDessie Linden
2010-07-13Manual merge from default branchVadim Savchuk
Resolved conflicts in llpaneloutfitedit.cpp --HG-- branch : product-engine
2010-07-13Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-07-13Merged from viewer-releaseDessie Linden
2010-07-13EXT-8146 FIXED Removed plural from question about outfit removalAndrew Dyukov
Corrected question string in xml. Trivial fix- no review. --HG-- branch : product-engine
2010-07-13EXT-8320 EXT-8321 FIXED Added missing names for items text in camera floater ↵Andrew Dyukov
xml. Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/738/ --HG-- branch : product-engine
2010-07-13merge from PE's viewer-releaseTofu Linden
2010-07-12mergeRichard Nelson
2010-07-12fix for invisible selections in edit outfit panelRichard Nelson
2010-07-12CT-575 WIP PL translation for sets 10-14, DA for set14, new filesEli Linden
2010-07-12Merged from viewer-releaseDessie Linden
2010-07-12Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-07-10merge from PE's viewer-releaseTofu Linden
2010-07-12Merge with another head in branchMike Antipov
--HG-- branch : product-engine
2010-07-12EXT-7884 (\"Set Default Upload Permissions\" may make more sense in the ↵Andrew Polunin
Upload sub-menu) - In viewer menu 'Set Default Upload Permissions' menu item was moved from 'Options' menu to the 'Upload' menu. - 'Set Default Upload Permissions' menu item was added to the inventory menu. - Removed stray separators. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/734/ --HG-- branch : product-engine
2010-07-12EXT-8322 FIXED Added second string for the Favorites folder with ↵Mike Antipov
name="InvFolder favorite". "Favorites" folder is created on first login for new account. Historically it can have default name started from "f" or "F" on different accounts. So, we have to localize both of them with the same value. Reviewed by Loren Shih at https://codereview.productengine.com/secondlife/r/731/ --HG-- branch : product-engine
2010-07-12Merge with another head in branchMike Antipov
--HG-- branch : product-engine
2010-07-12EXT-8048 FIXED Implemented fix in more proper way after 412588eb49a2 ↵Mike Antipov
(EXT-8003 FIX, EXT-8048 FIX) is backed out. Restoring string "You don't have any outfits yet. Try [secondlife:///app/search/all/ Search]" for case when there are no any outfits yet after backout. --HG-- branch : product-engine
2010-07-12Restored "PanelContentsTooltip" string committed in 412588eb49a2 by mistake ↵Mike Antipov
(and backed out in b9dbc7055df2) --HG-- branch : product-engine
2010-07-12Merge after backout of 412588eb49a2Mike Antipov
--HG-- branch : product-engine
2010-07-12Backed out changeset: 412588eb49a2Mike Antipov
That patch leaded to two issues: * broken message for empty accordion in Teleport History Panel. For now it looks like "Missing String (Didn't find... [Search].)" * there are multiple warnings like "LLTrans::getString: ONCE (10th time seen): Missing String in strings.xml: []" for accordions which have empty default strings (Friends list for ex.) --HG-- branch : product-engine
2010-07-12EXT-8323 FIXED added "name" attributes to facilitate translationIgor Borovkov
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/733/ --HG-- branch : product-engine
2010-07-12Merge from default branchMike Antipov
--HG-- branch : product-engine
2010-07-09mergeRichard Linden
2010-07-09forgot to remove a fileRichard Linden
2010-07-09EXT-8237 FIX Opening up Edit Outfit- Add More->Shirt causes FPS to drop from ↵Richard Linden
60fps to 18fps for a really long time EXT-8235 FIX HUGE long delay when reopening and/or closing edit outfit sidepanel if "Add More..." is active EXT-7695 FIX UI lockup after add wearable, right click av -> Change Outfit reviewed by Vir
2010-07-09EXT-8003 EXT-8004 fix remove duplicated string ID/contentEli Linden
2010-07-09Merged from viewer-releaseDessie Linden
2010-07-09EXT-7911 FIXED Avoided saving unresolved LLDialog notifications.Alexei Arabadji
Details: Made ScriptDialogGroup, ScriptDialog, LoadWebPage notifications non-persistent. reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/711/ --HG-- branch : product-engine
2010-07-09Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-07-09merge from PE's viewer-releaseTofu Linden
2010-07-09EXT-8296 FIXED Format currency properly in tooltips and the about land window.Aimee Linden
2010-07-08EXT-8251 FIXED Renamed the "Remove Link" item of the inventory context menu ↵Vadim Savchuk
to "Delete". Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/720/ --HG-- branch : product-engine
2010-07-08EXT-8170 ADDITIONAL FIX Now using complete translatable sentences like ↵Vadim Savchuk
"Create new shoes", "Create new pants", etc as labels for AE context menus. Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/716/ --HG-- branch : product-engine
2010-07-08EXT-8275 FIXED (Build > Group > Edit Group - Replace checkbox with new Edit ↵Paul Guslisty
icon, and move to the right of group name) - Switched order of 'Share' checkbox and 'Deed' button - Switched order of 'Group Name' name box and 'Set Group' button - Changed image_overlay of 'Set Group' button Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/717/ --HG-- branch : product-engine
2010-07-08Merged from viewer-releaseDessie Linden
2010-07-08Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-07-08merge from PE's viewer-publicTofu Linden
2010-07-07EXT-8003 FIX, EXT-8048 FIXBrad Payne (Vir Linden)
2010-07-07Merged from viewer-releaseDessie Linden
2010-07-07Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-07-07EXT-8149 FIXED (shop button needs a tooltip)Paul Guslisty
- Added tooltips for Shop buttons Reviewed by Vadim Savchuk and Neal Orman at https://codereview.productengine.com/secondlife/r/693/ --HG-- branch : product-engine
2010-07-07EXT-7879 FIXED (Edit Classified has duplicate \"Price for Ad\" and ↵Paul Guslisty
unnecessary help link) - Restored deleted spinner and its label - Added method to show\hide spinner and its label Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/698/ --HG-- branch : product-engine
2010-07-07merge from PE's viewer-releaseTofu Linden
2010-07-06Merged from viewer-release after resolving conflictsDessie Linden
2010-07-06automated mergeLoren Shih
2010-07-06EXT-8247 FIXED In-world object info in Edit->General menu clippedLoren Shih
Trivial change to move down the Name: field by a few pixels.