Commits

Show all
Author Commit Message Labels Comments Date
Vadim Savchuk
STORM-1543 WIP Minor cleanup.
Vadim Savchuk
STORM-1543 WIP Fixed auto-moving offered inventory items to trash. 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.
Vadim Savchuk
STORM-1543 WIP Fixed dropping nventory offers in busy mode. When auto-discarding inventory offers we looked up missing Busy button (i.e. a button having index=3) in the inventory offer notification dialog template. Failure to find the button resulted in ignoring inventory offers. Fixed that by "auto-clicking" the existing Discard button.
Scott Lawrence
merge changes for storm-1268
Vadim Savchuk
STORM-1268 Settings for ignorable dialogs were reset during deferred 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.
Scott Lawrence
merge changes for storm-1542
Vadim Savchuk
STORM-1542 FIXED Changed search URL back from search-beta to search.sl.com.
Scott Lawrence
merge changes for storm-1276
Jonathan Yap
STORM-1276 [MULTIPLE LANGS] Text truncation in Email Snapshot floater in Spanish localization
Scott Lawrence
merge changes for storm-1571
log_linden
merge
log_linden
Fixed LLProxy UI constraints. Fixed some XUI warnings in the Proxy Settings Floater.
log_linden
Fixed a xui widget name mismatch between c++ and xml.
log_linden
Merge.
log_linden
Backed out revision cbc793dcd3db to disable libcurl verbose logging.
log_linden
LLProxy: Renamed a setting to better describe what it controls.
log_linden
Backed out changeset 694594710de2
log_linden
Backed out rev 42d5f5df0a6a. Code was apparently needed afterall.
log_linden
Back out later: Turned on curl verbose logging for debugging purposes.
log_linden
LLProxy: Removed unneeded call to LLProxy::applyProxySettings, since it was already being called.
log_linden
merge
log_linden
LLProxy: xui string cleanup.
log_linden
merge
log_linden
Fixed numerous comment spelling errors in llerror.cpp and llerror.h
log_linden
LLProxy cleanup. 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.
log_linden
LLProxy: Added another attempt to download gpu and feature tables after 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.
log_linden
LLProxy cleanup. * 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.
log_linden
Proxy: Improved mutex usage in LLProxy. Introduced an LLAtomic member to track the status of the http proxy that can be checked without locking a mutex.
log_linden
STORM-1112 Input sanitization of proxy options.
log_linden
Proxy cleanup in llstartup.cpp and llproxy.cpp.
  1. Prev
  2. Next