summaryrefslogtreecommitdiff
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-08Added tag 3.0.0-start for changeset 6b678ea52f90Oz 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-08merge back release tagOz 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-05Added tag DRTVWR-75_2.8.3-beta1, 2.8.3-beta1 for changeset 599677276b22Debi King (Dessie)
2011-08-05remove override for channel testingOz Linden
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-05change parameters to test build for releaseOz Linden
2011-08-04remove parameter used in test buildsOz Linden
2011-08-04merge changes for SH-2218Oz Linden
2011-08-04merge changes for SH-2218Oz Linden
2011-08-04Added tag DRTVWR-72_2.8.1-release, 2.8.1-release for changeset 29e93d7e1999Debi King (Dessie)
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-04merge changes for storm-1537 : releasable mesh branchOz Linden
2011-08-04storm-1060 (temporary) adjust build params for icon selection testOz 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-02re-re-re-enable watchdogOz Linden
2011-08-02merge back late beta fixesOz Linden
2011-08-02merge back late release fixOz 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