summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2011-08-08mergeVadim ProductEngine
2011-08-08fix idiosyncratic name for beta viewer channel icon recognitionOz Linden
2011-08-08STORM-632 ADDITIONAL_FIX Disallow showing URL-like avatar display names as ↵Vadim ProductEngine
Web links in the ShareItemsConfirmation notification. Updating the <nolink> tag parsing regexp to enable multiple <nolink>...</nolink> clauses in a single textbox.
2011-08-08mergeDave Parks
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-08correct xml syntax errorOz Linden
2011-08-08correct merge-induced error in settings.xmlOz Linden
2011-08-08merge back beta tagsOz Linden
2011-08-08merge changes for storm-1060Oz Linden
2011-08-05merged .hgtagsDebi King (Dessie)
2011-08-05fixing scroller issueLeyla Farazha
2011-08-05add reading Linden names at build time from enviroment-specified fileOz Linden
2011-08-05STORM-1427 FIXED Fixed a debug assertion triggered in the world map floater.Vadim ProductEngine
Apparently, passing empty region name to the MapNameRequest makes server return empty name in MapBlockReply, which triggered the assertion.
2011-08-05EXP-863 FIX -- Add Outbox sync button that performs marketplace syncleslie@leslie-HPz600.lindenlab.com
EXP-908 FIX -- Hide outbox when appropriate EXP-1035 FIX -- Allow user to remove items from outbox EXP-1000 FIX -- New icon can cover long names in Received Items Panel EXP-1001 FIX -- Newness is removed on next login if you log out or crash before opening inventory panel EXP-1008 UPDATE -- Extra space at bottom of Inventory panel when Inbox/outbox not displayed * Updated "New" tag to properly display over long names per Epic's design * "New" tags now compare vs last inbox collapse time rather than expansion time * Marketplace inventory panels now have their own layout stack Reviewed by Leyla
2011-08-05sync with viewer-developmenteli
2011-08-05undo Mac app name change (again)Oz Linden
2011-08-05Merging STORM-565Vadim ProductEngine
2011-08-05STORM-1540 FIXED Fixed missing and duplicated names in ↵Vadim ProductEngine
floater_build_options.xml and floater_model_wizard.xml.
2011-08-05undo Mac app name changeOz Linden
2011-08-05STORM-1309 WIP Fixed maturity rating icon overlapping the floater right border.Vadim ProductEngine
The code that places it now takes into account possible text truncation.
2011-08-05STORM-1309 WIP Proper truncation of region type, estate name and estate ↵Vadim ProductEngine
owner text. * Use ellipses for truncation. * Where applicable, set tooltip to contain the uncut text. * Leave a few pixels of padding between the text and the floater right border. LLView::getChild<T>() never returns NULL, so no need to check its return value.
2011-08-05STORM-1309 WIP Fixed timestamp (last modified date) value truncation.Vadim ProductEngine
2011-08-05STORM-1309 WIP Appended a space after the colon in "Last modified:".Vadim ProductEngine
It seems to have been mistakenly omitted by translators.
2011-08-04Sync with viewer-developmentMerov Linden
2011-08-04sync with viewer-developmenteli
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-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-03storm-1534: code to allow external source of current Linden namesOz Linden
2011-08-03Automated merge with file:///Users/oz/Work/V-PROz Linden
2011-08-03Put back the Linden namesOz 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-02merged .hgtagsDebi King (Dessie)
2011-08-02* Fixed up outbox UI alignment to match inboxleslie@leslie-HPz600.lindenlab.com
* Added outbox item count to outbox button title * Updated sync loading indicator to keep moving until http request complete * Updated outbox panel display to use user_status http get response * Removed inbox/outbox folder name hack from LLInventoryPanel
2011-08-02STORM-1534: Derive Credits in About Second Life from doc/ sourcesOz Linden
2011-08-02STORM-1291 FOLLOWUP Localized common (unisex) gestures.Vadim ProductEngine