summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
AgeCommit message (Collapse)Author
2011-08-31MergeXiaohong Bao
2011-08-26merge changes for storm-1543Oz Linden
2011-08-25merge changes for storm-1268Oz Linden
2011-08-22STORM-1543 WIP More cleanup and comments.Vadim ProductEngine
2011-08-19STORM-1543 WIP Fixed auto-moving offered inventory items to trash.Vadim ProductEngine
It turned out impossible to properly remove an inventory item from within LLDiscardAgentOffer::done(), because that would lead to nested LLInventoryModel::notifyObservers() calls. Fixed that by deferring removal until the next LLAppViewer::idle() iteration. Also elimiteed duplicated code.
2011-08-19STORM-1268 Settings for ignorable dialogs were reset during deferred ↵Vadim ProductEngine
auto-upgrade. Reason: In case of deferred upgrade (i.e. when you select "Later...") the defaults for notifications settings are not loaded, so when the viewer exits after launching the updater, it incorrectly re-saves notifications settings. Fix: Initialize settings earlier, so that viewer picks them up in update mode.
2011-08-08mergeLogan Dethrow
2011-08-01SH-2183 Add a debug setting to control whether or not to use multiple ↵Dave Parks
threads in LLCurl
2011-07-28MergeLogan Dethrow
2011-07-24mergeDave Parks
2011-07-21SH-2031 Fix for stall in "Cleanup"Dave Parks
2011-07-20add a debug setting "MemoryPrivatePoolEnabled" to turn on/off private memory ↵Xiaohong Bao
pool.
2011-07-20fix a typo.Xiaohong Bao
2011-07-19MergeXiaohong Bao
2011-07-19mergeLogan Dethrow
2011-07-18merge changes for storm-1516Oz Linden
2011-07-16Automated merge with https://bitbucket.org/lindenlab/viewer-developmentjenn
2011-07-15STORM-1482 Always run the crash loggers, they will check what to do and how ↵Aaron Stone
to clean up.
2011-07-15Merge from viewer-developmentXiaohong Bao
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-12mergeLogan Dethrow
2011-07-11merge changes for storm-1315Oz Linden
2011-07-11Automated merge with ↵Xiaohong Bao
https://bitbucket.org/squire_linden/viewer-development-crash-horde
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-05STORM-1112 Fixed crash on quit. Other minor fixes:Logan Dethrow
* Reordered HTTP proxy choices in settings dialog * Now using setBlocking and setNonBlocking LLSocket methods during TCP handshakes. * Made those LLSocket methods available outside the class.
2011-06-29STORM-1315 Ability to do simple math in numeric edit fieldsKadah_Coba
2011-06-09merge up latest viewer-developmentOz Linden
2011-06-06VWR-25965 Fix to two calls to LLDirIterator mask argument.Logan Dethrow
Removed two cases in llappviewer.cpp where the mask argument to LLDirIterator had a leading delimiter.
2011-06-06merge changes for viewer-developmentOz Linden
2011-06-02Merge.Logan Dethrow
2011-06-01merge changes for latest viewer-developmentOz Linden
2011-06-01pull back fix for storm-1298 from beta branchOz Linden
2011-06-01Merge. Pulling fix for VWR-25862 into bigger cache tree.Logan Dethrow
2011-06-01fix for STORM-1298: Crash on startup of Second Life 2.7.1(231307)Xiaohong Bao
2011-06-01merge changes for storm-1296Oz Linden
2011-06-01merge changes for storm-1299Oz Linden
2011-05-26storm-1189: remove classic cloudsOz Linden
2011-05-25fix for SH-1624: Crash during viewer startup: ↵Xiaohong Bao
LLViewerTextureList::addImageToList
2011-05-25VWR-25862 Potential fix for caches not clearing when they are supposed to.Logan Dethrow
* Removed leading delimiter from filename mask in all calls to LLDir::deleteFilesInDir() that are related to the viewer asset caches (texture, VFS, and VO).
2011-05-24MergeDave SIMmONs
2011-05-23merge latest changes (post-2.7.0) from viewer-developmentOz Linden
2011-05-20Revamped viewer cache preference controls.Logan Dethrow
Implemented improved cache control user interface, changes approved by wolf. * Moved viewer cache controls from the setup preference panel to advanced * Changed cache size control slider into a spinner * Readded a clear cache button along with a cache clear confirmation dialog * Renamed the reset button to "Default Location" to clarify its function Related JIRAs: ER-815 ER-816 ER-818 ER-820 ER-821 ER-831
2011-05-17Merge with viewer-development (mesh)Don Kjer
2011-05-17un-hardcode the viewer name merged in from the mesh branchOz Linden
2011-05-17Merge with viewer-developmentDon Kjer
2011-05-17Merge from viewer-development.Vadim ProductEngine
2011-05-16mergeDave Parks
2011-05-13merge changes to improve build timesOz Linden
2011-05-11STORM-477 Restored the backed out changeset: b62b260aa04dSeth ProductEngine