summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2010-11-24SH-481 FIX linux build is over 200 MBNyx (Neal Orman)
A previous merge in our move to the public branch cut out the binary strip command from viewer_manifest.py. Putting it back in to restore small binaries.
2010-11-24STORM-500 : pull to viewer-developmentMerov Linden
2010-11-24STORM-491 : pull to viewer-developmentMerov Linden
2010-11-24STORM-479 : pull to viewer-developmentMerov Linden
2010-11-24STORM-375 : pull into viewer-developmentMerov Linden
2010-11-24Pull from viewer-betaMerov Linden
2010-11-24STORM-667 : pull to viewer-betaMerov Linden
2010-11-24STORM-667 FIXED Default name tag color changed to white to increase contrast ↵Seth ProductEngine
with default dark background.
2010-11-24STORM-531 FIX Danish translationeli_linden
2010-11-24MergeLeyla Farazha
2010-11-24DN-207: "Investigate why "unknown" is appearing in My Friends list"Leyla Farazha
2010-11-24STORM-375 FIXED Fixed resetting of opened accordion on ↵Andrew Productengine
minimizing/unminimizing Appearance floater. The floater on minimization behaved the way consistent with Appearance panel in sidetray on visibility change. - To let LLSidepanelAppearance::updateToVisibility() determine whether to reset state or not, "reset_accordion" field was added to LLSD that it passed to it. It's value is different depending on where updateToVisibility() was called from. "visible" field was added to store boolean value that was passed before fix without name, but now can't be used that way.
2010-11-24STORM-666 FIXED Menu spawned by the overflow button had invalid position in ↵Vadim ProductEngine
Place Profile and Avatar Profile panels. Changes: * Changed the button class from LLButton to LLMenuButton to avoid duplicating menu positioning logic. * Enabled LLMenuButton to support aligning menu to the top right corner of the button.
2010-11-24STORM-671 FIXED Renamed "Move & View" panel to avoid name duplication.Andrew Productengine
2010-11-24STORM-670 : merges fixes for CHOP-220 and CHOP-221Merov Linden
2010-11-24mergeBrad Payne (Vir Linden)
2010-11-24SH-564 WIP - scrubbing not needed if curl uses thread-safe c-ares libBrad Payne (Vir Linden)
2010-11-24Tweak fnumber and circle of confusion to be more typical of 35mm daytime.Dave Parks
2010-11-24mergeDave Parks
2010-11-24Depth of Field whenever "Lighting and Shadows" is enabled and ↵Dave Parks
global-illumination is not (experimental).
2010-11-24Merge viewer-developmentMerov Linden
2010-11-24Merge from lindenlab/viewer-betaMerov Linden
2010-11-23STORM-531 WIP temp fix, pending Danish translationeli_linden
2010-11-23CT-633 FIX DA translation (new file) for set19, for Viewer 2.4eli_linden
2010-11-23CT-633 FIX DA translation for set19, for Viewer 2.4eli_linden
2010-11-23(DN-211) Conference call dialog shows Conference with ??? (???) in title ↵Leyla Farazha
header with view display names on and off Inbox X
2010-11-23STORM-102: this is to correct a minor issue with ad-hoc conferences so that ↵Wolfpup Lowenhar
they do not get date stamped at all since each one is defined as a unique conversation.
2010-11-23STORM-556 FIXED Don't reset search filter when docking the People SP.Vadim ProductEngine
As a side effect, the filter will not be reset when switching to People from another SP, but this is consistent with all other sidepanels (e.g. switching to Places doesn't reset its seach filter as well).
2010-11-23[mq]: thread_state_fixAndrew A. de Laix
2010-11-23DN-212 [crashhunters] LLCacheName::buildLegacyNameLeyla Farazha
2010-11-23DN-211 Conference call dialog shows Conference with ??? (???) in title ↵Leyla Farazha
header with view display names on and off
2010-11-23STORM-491 FIXED Fixed black arrows appearance near column's titles in scrollist.Andrew Productengine
Bug was caused by setting image overlay with arrows that have "transparent" color when arrows are not needed. When scrollist was disabled while refreshing, they somewhy were visible in black color. - Now null image overlay is set when arrow shouldn't be visible.
2010-11-23automated merge from mesh-developmentLoren Shih
2010-11-23SH-429 FIXED Inventory Filter for Meshes does not workLoren Shih
Mesh inventory filter was added incorrectly to filters pane, and was not hooked up to any code.
2010-11-23Fix for SH-479prep linden
2010-11-22Minor improvement to CHOP-220 unit test.brad kittenbrink
2010-11-22Fix for CHOP-220. Reviewed by mani.brad kittenbrink
2010-11-22Added failing unit test which I believe should exercise CHOP-220 crash.brad kittenbrink
2010-11-22CTS-320 SH-465 FIX use system zlib for standalone buildsNyx (Neal Orman)
pulling boroondas' changes to change our includes to use the system versions of zlib if doing a standalone build. Code changes are minimal, and appear to work correctly. Approved. - Nyx
2010-11-23STORM-479 FIXED Changed Teleport History SP text color to match the default ↵Seth ProductEngine
Landmarks and Inventory items color.
2010-11-22Automated merge with https://hg.secondlife.com/mesh-developmentNyx (Neal Orman)
2010-11-22SH-466 FIX fix of VWR-20670/SNOW-506 lost in mergeNyx (Neal Orman)
Verified that the fix is no longer in mesh-development. Verified fix is still in viewer-development. Fix is simply changing visibility of LLInstanceTracker base in LLEventTimer from protected to public. The lack of this fix indicates a bad merge. Re-applying fix.
2010-11-22SH-467 FIX fix of VWR-20809/SNOW-504 lost in mergeNyx (Neal Orman)
re-applying the fix originally committed as c5ddd1e361ae. This allows standalone builds to not depend on stage_third_party_libs but was lost in a merge as referenced in jira. Re-reviewed the code in the patch and it is a valid fix.
2010-11-22SH-468 FIX fix of VWR-20810/SNOW-503 lost in mergeNyx (Neal Orman)
re-applying changeset b987077e9bbb as it was lost in the merge. reviewed the original patch, appears valid.
2010-11-22merge of earlier code that got stomped from a previous mergeprep linden
2010-11-22STORM-500 FIXED Fixed resizing of "Edit Alpha" and "Edit Tattoo" panels.Vadim ProductEngine
2010-11-22STORM-521 FIXED Made defensive fix for crash in ↵Andrew Productengine
LLAudioSource::hasPendingPreloads(). Couldn't reproduce the crash, but made defensive fix. Added check for NULL into for loop that iterates through mPreloadMap in LLAudioSource::hasPendingPreloads(). Such check is already present in similar situation in LLAudioEngine::startNextTransfer().
2010-11-22increment viewer version number to 2.5Oz Linden
2010-11-22Moved some public LLSideTray methods to protected section.Vadim ProductEngine
2010-11-22STORM-461 FIXED Hide sidebar tab buttons in mouselook mode.Vadim ProductEngine