summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2010-02-19mergeDave Parks
2010-02-19Consolidate now preserves materials.Dave Parks
2010-02-19viewer2 mergeTofu Linden
2010-02-19PE merge.Tofu Linden
2010-02-19viewer2 merge, again.Tofu Linden
2010-02-19Wow, fix gcc fussiness that only happens in release builds for some reason.Tofu Linden
2010-02-19fix warning introduced from trunk merge.Tofu Linden
2010-02-19viewer2 merge.Tofu Linden
2010-02-19merge from viewer2, conflicts resolved...Tofu Linden
2010-02-19move what seems like a confused file add from our default/base path debacle.Tofu Linden
2010-02-19EXT-2891 "Group notices should be recorded into group IM history",Alexei Arabadji
corrected logging of stub group notices; --HG-- branch : product-engine
2010-02-19Fixed low bug EXT-4676 (Sell Land: Tab does not move to next control)Eugene Mutavchi
--HG-- branch : product-engine
2010-02-19Fixed normal bug EXT-5488(After login to specific region, next startup shows ↵Eugene Mutavchi
location box empty preventing login) --HG-- branch : product-engine
2010-02-19Partial fix for major bug EXT-5524 (Crash in LLVoiceClient when quitting ↵Andrew Dyukov
viewer without login). - Used call of LLVoiceClient::instanceExists() instead of gVoiceClient in check in LLVoiceChannel destructor to avoid crash when quitting viewer by closing console window before login. So now crash won't happen in LLVoiceClient::removeObserver(). But crash will occur in other destructors later, so further investigation needed. --HG-- branch : product-engine
2010-02-19PE merge.Tofu Linden
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-19Automated merge with https://hg.productengine.com/secondlife/viewer-2-0/Alexei Arabadji
--HG-- branch : product-engine
2010-02-19EXT-5101 “No feedback provided when accepting a friend request”,Alexei Arabadji
suppresed toasting when logging accept/decline --HG-- branch : product-engine
2010-02-19Implemented low task EXT-5215 (Disable showing full yyyy/mm/dd timestamp for ↵Eugene Mutavchi
messages (nearby chat/im) received today) --HG-- branch : product-engine
2010-02-19DEV-46346 Cycle5 translation DE. A few missing strings from cycle3Eli Linden
2010-02-19MergeMike Antipov
--HG-- branch : product-engine
2010-02-19EXT-5553 improve alpha mask ('fast alpha') heuristicTofu Linden
rev'd by davep
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 Cycle5 translation FR new filesEli 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 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-18viewer2 merge.Tofu Linden
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 01:46:19 +0000