summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2010-02-19Merge from default branchMike Antipov
--HG-- branch : product-engine
2010-02-19fixed EXT-5101 “No feedback provided when accepting a friend request”,Alexei Arabadji
added logging of friendship offer accept/decline; --HG-- branch : product-engine
2010-02-19DEV-46346 Cycle4 more linguistic change JAEli Linden
2010-02-19DEV-46346 Cycle4 more linguistic change JAEli Linden
2010-02-19DEV-46346 Cycle5 translation FR new filesEli Linden
2010-02-19DEV-46346 Cycle5 translation FR new filesEli Linden
2010-02-19DEV-46346 Cycle5 translation FREli Linden
2010-02-19DEV-46346 Cycle5 translation FREli Linden
2010-02-18Model preview now loads materials.Dave Parks
2010-02-19DEV-46346 Cycle5 translation DE new filesEli Linden
2010-02-19DEV-46346 Cycle5 translation DE new filesEli Linden
2010-02-19DEV-46346 Cycle5 translation DEEli Linden
2010-02-19DEV-46346 Cycle5 translation DEEli Linden
2010-02-19DEV-46346 Cycle5 translation JAEli Linden
2010-02-19DEV-46346 Cycle5 translation JAEli Linden
2010-02-19DEV-46346 Cycle5 translation JAEli Linden
2010-02-19DEV-46346 Cycle5 translation JAEli Linden
2010-02-19DEV-46346 Cycle4 linguistic change DE and JAEli Linden
2010-02-19DEV-46346 Cycle4 linguistic change DE and JAEli Linden
2010-02-18mergeRichard Nelson
2010-02-18EXT-5545 - make volume popup and nearby media popup mutually exclusiveRichard Nelson
reviewed by Leyla
2010-02-18MergeLeyla Farazha
2010-02-18EXT-5440 Deleting Script in Object contents deletes object when using ↵Leyla Farazha
delete key on keyboard reviewed by Richard
2010-02-18Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Chuck Linden
2010-02-18Automated merge with file:///Users/chuck/Documents/hg/viewer-hotfixChuck Linden
2010-02-18Automated merge with ssh://hg.lindenlab.com/q/viewer-hotfixChuck Linden
2010-02-18Finished (for now) side-panel cleanup.Chuck Linden
http://jira.secondlife.com/browse/EXT-4335
2010-02-18automergeKent Quirk
2010-02-18Backed out changeset 49e628c3a0c5 - further changes for reverting ↵Kent Quirk
default/base changes.
2010-02-18Missed the CMake file in backing out changesKent Quirk
2010-02-18move base back to default because doing it as a backout was causing merge errorsKent Quirk
2010-02-18merge changes from backing out the directory change of default to baseKent Quirk
2010-02-18Backed out cpp changes from changeset 49e628c3a0c5Kent Quirk
2010-02-18Reverting change 570851c5baa5Kent Quirk
because it's broken
2010-02-18Automated merge with ssh://hg.lindenlab.com/q/viewer-hotfixMonroe Linden
2010-02-18Fix for EXT-5120 "Mouse-up in the scrollbar to the right of a link in nearby ↵Monroe Linden
chat window opens the link". Added an optional bool parameter "hit_past_end_of_line" to LLTextBase:: getDocIndexFromLocalCoord() and getSegmentAtLocalPos(). Default is true, which gives the old behavior. If false, clicks past the end-of-line won't map to the last segment on the line. Made LLNormalTextSegment::handleHover(), handleRightMouseDown(), handleMouseDown(), and handleMouseUp() call getSegmentAtLocalPos() in this new mode before processing URL actions, and only do the processing if it returns the same segment. Reviewed by Richard.
2010-02-18Automated merge with ssh://hg.lindenlab.com/q/viewer-hotfixMonroe Linden
2010-02-18mergerichard
2010-02-18viewer2 merge.Tofu Linden
2010-02-18fixed line endingsrichard
2010-02-18Additional optimizations to text reflow for EXT-5071.Monroe Linden
Added versions of LLFontFreeType::getXAdvance() and LLFontFreeType::getXKerning() that take LLFontGlyphInfo* instead of llwchar. This allows code in LLFontGL that already has the LLFontGlyphInfo* to pass them instead, saving calls to LLFontFreetype::getGlyphInfo. Reviewed by Richard.
2010-02-18mergerichard
2010-02-18Work in progress on EXT-5333: Bodyparts missing from appearance and COFBrad Payne (Vir Linden)
2010-02-18fixed some spacing munged by mergerichard
2010-02-18EXT-5535 - Resize handles will move floater when reaching minimum sizerichard
2010-02-18Merge with tipCallum Prentice
2010-02-18EXT-5363 webkit does not strip spaces off a typed-in URLCallum Prentice
Reviewed by CB
2010-02-18Merge - updating from hotfixLeyla Farazha
2010-02-18EXT-4677 Crash when closing pinned menu which has no parent Inventory floaterLeyla Farazha
Reviewed by Richard CC#118
2010-02-18Mergerichard
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-01 13:24:37 +0000