summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-07-12Removed default proxy server.Logan Dethrow
2011-07-11Renamed proxy settings in xui.Logan Dethrow
2011-07-07STORM-1112 Disable SOCKS 5 proxy by default.Logan Dethrow
2011-07-06Changed lllog messages in llproxy.cpp to new macros.Logan Dethrow
2011-07-05Merge.Logan Dethrow
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-30merge changes for shining branchOz Linden
2011-06-30MergeLogan Dethrow
2011-06-30merge changes for sec-906Oz Linden
2011-06-30STORM-1112 Rearranged proxy preferences panels.Logan Dethrow
2011-06-30mergeDave Parks
2011-06-30merge changes for storm-1452Oz Linden
2011-06-30merge changes for storm-1406Oz Linden
2011-06-30merge changes for storm-1327Oz Linden
2011-06-30merge changes for storm-1396Oz Linden
2011-06-30merge changes for storm-457Oz Linden
2011-06-29merge changes for storm-1463Oz Linden
2011-06-29merge changes for storm-1423Oz Linden
2011-06-29merge changes for storm-1392Oz Linden
2011-06-29merge changes for storm-1368Oz Linden
2011-06-29Merge latest from lindenlab/viewer-developmentDave SIMmONs
2011-06-29merge changes for storm-1302Oz Linden
2011-06-29merge changes for storm-1326Oz Linden
2011-06-29merge changes for storm-1292Oz Linden
2011-06-29storm-1454Oz Linden
2011-06-29merge changes for storm-1439Oz Linden
2011-06-29merge changes for storm-1352Oz Linden
2011-06-28Crashfix for SEC-906Aura Linden
2011-06-28STORM-1112 More cleanup of SOCKS 5 proxy code.Logan Dethrow
Renamed llsocks5.cpp to llproxy.cpp.
2011-06-28STORM-1447, STORM-1446Squire
merged from https://bitbucket.org/stone_linden/viewer-development-storm-1368
2011-06-28Merged in viewer-development changesSquire
2011-06-28STORM-1423 (aka VOICE-3) merged fromSquire
roxie_linden/viewer-developement
2011-06-28STORM-1372, STORM-1439Squire
Merged in: alain_linden/viewer-development lindenlab/viewer-development
2011-06-28STORM-1334: compute area using integer math to avoid type conflictOz Linden
2011-06-28merge changes for storm-1103Oz Linden
2011-06-28merge changes for storm-323Oz Linden
2011-06-28merge changes for vwr-25480Oz Linden
2011-06-28merge changes for storm-1393Oz Linden
2011-06-28merge changes for storm-1334Oz Linden
2011-06-28merge changes for late beta fixesOz Linden
2011-06-28merge changes for beta tagsOz Linden
2011-06-28STORM-1452 Debug settings -- TRUE/FALSE name (not label) translated in ↵Tankmaster Finesmith
foreign languages with help from Jonathan Yap
2011-06-27FIX VWR-25681eli_linden
2011-06-27FIX VWR-25943 en_xui_changeeli_linden
2011-06-27FIX VWR-25881eli_linden
2011-06-27FIX VWR-25880eli_linden
2011-06-27FIX VWR-25879eli_linden
2011-06-27FIX VWR-25660eli_linden
2011-06-27STORM-1446 Portability fix when setting non-blocking socket options.Aaron Stone
2011-06-27STORM-1447 Use <filters>setenv</> stanza rather than grep -v setenv.Aaron Stone