summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2011-07-14SH-715 Disable simplify/analyze button while counterpart is executing.Dave Parks
2011-07-13mergeBrad Payne (Vir Linden)
2011-07-13mergeBrad Payne (Vir Linden)
2011-07-13SH-1637 FIX, SH-1638 FIX - fixes jittery camera problemsBrad Payne (Vir Linden)
2011-07-13mergeBrad Payne (Vir Linden)
2011-07-12MergeDon Kjer
2011-07-12Changes to support SH-1894: Textures uploaded with Mesh do not appear in ↵Don Kjer
inventory. Reviewed by Andrew
2011-07-13Watchdog timeout now set to 60 seconds for long-term use (instead of 20, ↵jenn
used during crash pile-on). Updated setting description field to describe how setting the value of WatchdogEnabled will affect Viewer behavior.
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-1125 Retry when failing to get seed capability.Dave Parks
2011-07-12Automated merge with http://hg.secondlife.com/mesh-developmentXiaohong Bao
2011-07-12fix for SH-2040: Missing '?: 0' and old style object/prim counts under Edit ↵Xiaohong Bao
linked when Mesh disabled
2011-07-12mergeDave Parks
2011-07-12SH-2050 Hide UI that breaks down upload fee and rename some fields.Dave Parks
2011-07-12Automated merge with http://hg.secondlife.com/mesh-developmentXiaohong Bao
2011-07-12mergeBrad Payne (Vir Linden)
2011-07-12SH-2049 FIXBrad Payne (Vir Linden)
2011-07-12SH-2043 FIXBrad Payne (Vir Linden)
2011-07-12mergeDave Parks
2011-07-12SH-2053 Don't poke the UI from a background thread -- it tends to get crashy.Dave Parks
2011-07-12SH-2052 Fix for reported PE being too low when selecting more than 500 objects.Dave Parks
2011-07-11fix for SH-2051: viewer crashes when try to disbable "Show Upload Cost"Xiaohong Bao
2011-07-11merge changes for storm-1315Oz Linden
2011-07-11merge changes for storm-1459Oz Linden
2011-07-11merge changes for storm-1325Oz 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-11mergeBrad Payne (Vir Linden)
2011-07-11Fix for linux build failure, hopefullyBrad Payne (Vir Linden)
2011-07-11mergeBrad Payne (Vir Linden)
2011-07-11merge changes for storm-1481Oz Linden
2011-07-11merge changes for storm-1472Oz Linden
2011-07-11merge changes for storm-1483Oz 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-08SH-2007 Don't eat an entire core when uploading meshes or requesting fee ↵Dave Parks
information.
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