summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
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/viewer/viewer-2-0/Chuck Linden
2010-02-18Automated merge with file:///Users/chuck/Documents/hg/viewer-hotfixChuck Linden
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-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-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-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-18mergerichard
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-18merge.Tofu Linden
2010-02-18EXT-5389 Unreadable resident names with glow.Tofu Linden
2010-02-18merge with ssh://hg.lindenlab.com/q/viewer-hotfix/Aimee Linden
2010-02-18EXT-5370: Voice volumes set for other agents reverting between voice sessionsAimee Linden
mVolumeDirty needs to be set when recalling volume levels, for both the participant and the session, to trigger sending a volume change message to Vivox. Reviewed by: Lynx.
2010-02-18more cleanup of some dead members.Tofu Linden
2010-02-18minor cleanup in prep for EXT-5389Tofu Linden
2010-02-18EXT-5460 OK and Cancel buttons missing from own snapshotsTofu Linden
2010-02-18PE merge.Tofu Linden
2010-02-18Fixed critical bug EXT - 4878 (Tab labels are no longer obeying halign ↵Paul Guslisty
attribute) --HG-- branch : product-engine
2010-02-18Fixed low bug EXT - 4751 (VCP hides while avatar inspector in use)Paul Guslisty
- Updated an Avatar Inspector to register / unregister itself in the Transient Floater Manager --HG-- branch : product-engine
2010-02-17EXT-5515 - Allow resizing on left and lower left of nearby media popupRichard Linden
2010-02-17EXT-5515 - Allow resizing on left and lower left of nearby media popupRichard Linden
2010-02-17Partial fix for EXT-5071.Monroe Linden
Changed the index on the keyword map in LLKeywords so that LLKeywords::findSegments() doesn't have to create LLWString objects to search the map. Reviewed by Richard.
2010-02-17Automated merge with ssh://rick@hg.lindenlab.com/q/viewer-hotfix/Rick Pasetto
2010-02-17Automated merge with ssh://rick@hg.lindenlab.com/q/viewer-hotfix/Rick Pasetto
2010-02-17EXT-5079 : Make sure to initialize ambient audio properly when it is mutedRick Pasetto
Reviewed by Richard (actually it was his idea)
2010-02-17mergePalmer
2010-02-17EXT-5309 : prevent infinite loop in LLConsole. Reviewed by RichardPalmer
2010-02-17Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Chuck Linden
2010-02-17Automated merge with file:///Users/chuck/Documents/hg/viewer-hotfixChuck Linden
2010-02-17mergeRichard Linden
2010-02-17EXT-5461 - Installing 1.23.5 release version over recent 2.0 builds corrupts ↵Richard Linden
1.23s UI reviewed by Leyla
2010-02-17Automated merge with ssh://rick@hg.lindenlab.com/q/viewer-hotfix/Rick Pasetto