summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
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-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-05SH-2218 FIX -- v2.8.x Viewers crash consistently when I actively use other ↵Leslie Linden
applications * Mac memory stats now extracted from proper system calls. Reviewed by Nat Linden.
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-04merge changes for SH-2218Oz Linden
2011-08-04merge changes for SH-2218Oz Linden
2011-08-04Sync with viewer-developmentMerov 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-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-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-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-02STORM-1534: Derive Credits in About Second Life from doc/ sourcesOz Linden
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-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-01STORM-1186 FIXED Removed the "no mCurrentRMessageTemplate" warning message.Vadim ProductEngine
The mCurrentRMessageTemplate member seems to only be non-NULL for a short while after an incoming message was validated and parsed, thus there is no guarantee that we can obtain name of the last received message at any given time. So if we can't we'll simply return an empty string without spamming the log with warnings.