summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2011-08-08mergeLogan Dethrow
2011-08-08Fixed numerous comment spelling errors in llerror.cpp and llerror.hLogan Dethrow
2011-08-08LLProxy cleanup.Logan Dethrow
Made the socks proxy start first in llstartup.cpp Moved initialization of the proxy to before the HTTP table fetch Added Doxygen comments to LLProxy methods. Removed call to applyProxySettings in llxmlrpctransaction.cpp since the ctor of LLCurlEasyRequest will apply the proxy settings.
2011-08-08increment viewer version to 3.0.1Oz Linden
2011-08-08correct xml syntax errorOz Linden
2011-08-08correct version number typoOz Linden
2011-08-08correct merge-induced error in settings.xmlOz Linden
2011-08-08merge back beta tagsOz Linden
2011-08-08increment viewer version to 3.0.0Oz Linden
2011-08-08merge changes for storm-1060Oz Linden
2011-08-05merged .hgtagsDebi King (Dessie)
2011-08-05undo Mac app name change (again)Oz Linden
2011-08-05Merging STORM-565Vadim ProductEngine
2011-08-05undo Mac app name changeOz Linden
2011-08-04merge changes for SH-2218Oz Linden
2011-08-04merge changes for SH-2218Oz Linden
2011-08-04storm-1060 : add windows (thanks Kadah and Michelle), remove some files I ↵Oz Linden
think are no longer used
2011-08-04merge changes for storm-1538Oz Linden
2011-08-04merge changes for storm-1355Oz Linden
2011-08-04merge changes for storm-1458Oz Linden
2011-08-04merge changes for storm-1291Oz Linden
2011-08-04fix path choice for project branches, attempt to fix linux iconOz Linden
2011-08-04LLProxy: Added another attempt to download gpu and feature tables after ↵Logan Dethrow
successfully setting up a proxy. Other minor changes: Clarified why we are using SOCKS5 as the "grid" argument to store proxy credentials. Added class wide logging to the LLProxy class.
2011-08-04correct default channelOz Linden
2011-08-04merge back disabling of watchdogOz Linden
2011-08-04fix license headersOz Linden
2011-08-04fix DOS line endingsOz Linden
2011-08-04storm-1060 (partial) : update icon selection for Mac and Linux buildsOz Linden
2011-08-03SH-2218 WORK AROUND -- v2.8.x Viewers crash consistently when I actively use ↵Leslie Linden
other applications * Just removed mac memory stats to make a low-risk work-around.
2011-08-03Automated merge with file:///Users/oz/Work/V-PROz Linden
2011-08-02merge changes for storm-1535Oz Linden
2011-08-02disable watchdogOz Linden
2011-08-02Pull from richard/viewer-experienceMerov Linden
2011-08-02SH-2202 FIX physics costs have increasedNyx (Neal Orman)
Changed the default to use low LOD for single hull generation, will fall back to medium or high if not present.
2011-08-02Sync with lindenlab/viewer-developmentMerov Linden
2011-08-02pulling latest viewer-development into mesh merge branch.Nyx (Neal Orman)
2011-08-02LLProxy cleanup.Logan Dethrow
* Removed early returns in LLStartup::handleSocksProxy * Corrected some cases that would result in handleSocksProxy not being called again during login if settings changed * Allowed for short replies in tcp_handshake in LLProxy.cpp * Renamed LLProxy::isEnabled() to LLProxy::isSocksProxyEnabled() to clarify its use.
2011-08-02Attempt to fix Linux build failureMerov Linden
2011-08-02merged .hgtagsDebi King (Dessie)
2011-08-02Fix build of llimage_libtestMerov Linden
2011-08-02SH-2183 Thread local storage initialization is unreliable.Dave Parks
2011-08-02SH-2183 Only apply multi-threaded curl on the main thread.Dave Parks
2011-08-02STORM-1291 FOLLOWUP Localized common (unisex) gestures.Vadim ProductEngine
2011-08-02Proxy: Improved mutex usage in LLProxy. Introduced an LLAtomic member to ↵Logan Dethrow
track the status of the http proxy that can be checked without locking a mutex.
2011-08-01SH-2183 Add a debug setting to control whether or not to use multiple ↵Dave Parks
threads in LLCurl
2011-08-01merge changes for storm-1535Oz Linden
2011-08-01increment viewer version to 2.8.4Oz Linden
2011-07-29Include some certs that were missed in the latest cert update. Specifically,Roxie Linden
paypal had a verisign -2 CA cert, and the new trust list only includes -3. Also, disable use of the system cert store. Just use our list.
2011-07-29EXP-1057 FIX Cursor doesn't go to the input field on the Find Floater due to ↵Richard Linden
lack of window focus also allow right clip to copy url from disabled address bar
2011-07-29SH-2200 Fix for BSOD on 7800 Go on Vista when setting graphics detail to "High"Dave Parks