summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
AgeCommit message (Collapse)Author
2011-07-26merge with latest mesh-devNyx (Neal Orman)
2011-07-18mergeDave Parks
2011-07-18merge changes for storm-1517Oz Linden
2011-07-18merge changes for storm-1516Oz Linden
2011-07-18sync with viewer-developmenteli
2011-07-16Automated merge with https://bitbucket.org/lindenlab/viewer-developmentjenn
2011-07-14Potential fix for SH-1854 and SH-1125 (caps issues)Don Kjer
2011-07-14FIX STORM-1494 remove duplicate ID and xml snippeteli
2011-07-13mergeBrad Payne (Vir Linden)
2011-07-12Merge for STORM-1482Aaron Stone
2011-07-12STORM-1482 The Viewer shouldn't overwrite the crash behavior settings, some ↵Aaron Stone
cleanups to the crash reporters, and the ability to use --set GroupName.SettingName to set parameters outside of the (default) Global settings group.
2011-07-12mergeDave Parks
2011-07-12SH-2050 Hide UI that breaks down upload fee and rename some fields.Dave Parks
2011-07-12SH-2049 FIXBrad Payne (Vir Linden)
2011-07-12SH-2043 FIXBrad Payne (Vir Linden)
2011-07-11fix for SH-2051: viewer crashes when try to disbable "Show Upload Cost"Xiaohong Bao
2011-07-11merge changes for storm-1459Oz Linden
2011-07-11Automated merge with ↵Xiaohong Bao
https://bitbucket.org/squire_linden/viewer-development-crash-horde
2011-07-11more fix for STORM-1468: [crashhunters] pre-login crash at ↵Xiaohong Bao
LLViewerWindow::LLViewerWindow(std::basic_string,std::allocator > const &,std::basic_string,std::allocator > const &,int,int,int,int,int,int) [secondlife-bin llviewerwindow.cpp]
2011-07-11Fix for sh-1982 and sh-2025prep
2011-07-11mergeprep
2011-07-11SH-2012: removed upload wizard from inventory '+' menuprep
2011-07-11merge changes for storm-1472Oz Linden
2011-07-10mergeDave Parks
2011-07-09Added L$ price breakdown for model uploadsDon Kjer
2011-07-09mergeDave Parks
2011-07-09SH-2007 Code cleanup, expand minimum header size to 4KB, better comments ↵Dave Parks
around magic numbers, remove dead calcResourceCost
2011-07-09MergeDon Kjer
2011-07-09Fix for SH-2028. Also fixed layout issues with new upload warning and ↵Don Kjer
upload price text when floater is resized.
2011-07-09mergeBrad Payne (Vir Linden)
2011-07-08fix for STORM-1468: [crashhunters] pre-login crash at ↵Xiaohong Bao
LLViewerWindow::LLViewerWindow(std::basic_string,std::allocator > const &,std::basic_string,std::allocator > const &,int,int,int,int,int,int) [secondlife-bin llviewerwindow.cpp]
2011-07-08merge changes for storm-1491Oz Linden
2011-07-08Merge viewer-development -> mesh-developmentDon Kjer
2011-07-08Merge viewer-development -> mesh-developmentDon Kjer
2011-07-08merge changes for storm-1489Oz Linden
2011-07-08ER-910 cleanup: removed a stale comment, tweaked text in About Land dialogsimon@lindenlab.com
Options tab.
2011-07-08Fix for sh-2016 Removed extra charprep linden
2011-07-08Fix for sh-2016prep linden
2011-07-08merge changes for storm-1484Oz Linden
2011-07-08merge changes for storm-1462Oz Linden
2011-07-08Fix for sh-2012 removed upload wizard optionprep linden
2011-07-07Merge latest from viewer trunksimon@lindenlab.com
2011-07-07Revert code fo ER-1016 - "Remove ability for anyone to edit terrain"simon@lindenlab.com
and muck with the "About Land" Options tab one more time.
2011-07-07Automated merge with http://hg.secondlife.com/viewer-developmentRichard Linden
2011-07-07STORM-1484 FIXED Restored Apply button in the Estate tab of the REGION / ↵Vadim ProductEngine
ESTATE floater.
2011-07-06EXP-982 FIX As a user, I wuold like to see the new web-based profiles ↵Richard Linden
without any browser chrome fixed status bar resizing to take up too much space
2011-07-06EXP-847 FIX As a user, I would like to see the How To floater appear the ↵Richard Linden
first time I log in to basic mode
2011-07-06STORM-1479 FIXED Duplicated IDs in the Edit Day Cycle floater.Vadim ProductEngine
2011-07-06STORM-1472 FIXED Favorites folder in inventory does not translate properlyPaul ProductEngine
Reason: Instead of changing value of existing strings (Favorite and favorite) a new string(My Favorites) with wrong key was added. Solution: Deleted unnecessary string ("My Favorites") and added proper translation to the existing strings (Favorite and favorite).
2011-07-05Automated merge with ssh://hg.lindenlab.com/richard/viewer-experienceRichard Linden