summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2010-02-19merge.Tofu Linden
2010-02-19Linux viewer: add some instrumentation to detect VM and/or RSS bloat at ↵Tofu Linden
runtime. This helped me identify the EXT-5552 cause (fix landing soon)
2010-02-19DEV-46346 Cycle5 translation DE. A few missing strings from cycle3Eli 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 FREli 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 JAEli Linden
2010-02-19DEV-46346 Cycle5 translation JAEli Linden
2010-02-19DEV-46346 Cycle4 linguistic change DE and JAEli Linden
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-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-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
2010-02-18Backed out changeset: 744bd7c535farichard
2010-02-18EXT-5532 Remove any UI evidence of select-buffer rendering's existenceTofu Linden
This removes the snapshot 'matte' option. This has been broken for a while, does not appear in spec, there is no pjira evidence that anyone noticed, and it has a LOT of squirrelly code behind it. Remove the UI option. Later, if no-one screams, the big piles of underlying code can be removed.
2010-02-18mergerichard
2010-02-18PE merge.Tofu Linden
2010-02-18Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Lynx Linden
2010-02-18DEV-44136: Don't show previous search results when opening Find floater.Lynx Linden
We now tear down the web view when we close the find floater. This means that we don't show the previous search results when performing a new search. It also makes for more efficient use of resources as we don't have a web view continually running in the background. (This is how the Help Browser currently works too.)
2010-02-18Fixed low bug EXT-871 ("Stop Flying" button isn't displayed after standing up)Mike Antipov
- moved code to show Stop Flying button in a common place for both cases: click on "Stand" btn & call "Stand Up" menu item --HG-- branch : product-engine
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-18Corrected embedded notification panel message index in session list;Alexei Arabadji
--HG-- branch : product-engine
2010-02-18EXT-5461: Reverting change 49e628c3a0c5.Lynx Linden
Renaming skins/base back to skins/default to unblock I10n. Revert was requested by Q.
2010-02-18EXT-5461: Reverting change 49e628c3a0c5.Lynx Linden
Renaming skins/base back to skins/default to unblock I10n. Revert was requested by Q.
2010-02-18fixed EXT-5006 “One inventory offer cause blinking of both Conversations andAlexei Arabadji
Notifications wells”, embedded inventory offer panel into IM window; --HG-- branch : product-engine
2010-02-18merge.Tofu Linden