be710bc9bc
move what seems like a confused file add from our default/base path debacle.
2010-02-19 13:49:39 +00:00
c3a71b7dcb
PE merge.
2010-02-19 13:08:10 +00:00
24c7e08b40
EXT-5552 Linux viewer running out of address space, crashing frequently and untracably
...
Yes, we were really hitting 3GB of address space. And quickly. Because we keep ~645 fonts mmap()d on a typical Linux system. Switch to a libfreetype that doesn't mmap(). This is lower risk than fixing the font system right now...
2010-02-19 12:55:11 +00:00
57feebb2a6
merge.
2010-02-19 12:26:17 +00:00
2165d8c376
Linux viewer: add some instrumentation to detect VM and/or RSS bloat at runtime. This helped me identify the EXT-5552 cause (fix landing soon)
2010-02-19 12:24:44 +00:00
f752b73cb2
Automated merge with https://hg.productengine.com/secondlife/viewer-2-0/
...
--HG--
branch : product-engine
2010-02-19 14:05:22 +02:00
5d0993193b
EXT-5101 “No feedback provided when accepting a friend request”,
...
suppresed toasting when logging accept/decline
--HG--
branch : product-engine
2010-02-19 14:04:25 +02:00
10c5f2f080
Implemented low task EXT-5215 (Disable showing full yyyy/mm/dd timestamp for messages (nearby chat/im) received today)
...
--HG--
branch : product-engine
2010-02-19 13:36:47 +02:00
dc4022060b
DEV-46346 Cycle5 translation DE. A few missing strings from cycle3
2010-02-19 19:14:05 +08:00
36f8239fe1
Merge
...
--HG--
branch : product-engine
2010-02-19 12:33:15 +02:00
3fb3b9cf21
Merge from default branch
...
--HG--
branch : product-engine
2010-02-19 11:12:38 +02:00
e492a24a19
fixed EXT-5101 “No feedback provided when accepting a friend request”,
...
added logging of friendship offer accept/decline;
--HG--
branch : product-engine
2010-02-19 10:57:27 +02:00
e1c8cd395e
DEV-46346 Cycle4 more linguistic change JA
2010-02-19 16:09:03 +08:00
92c937152e
DEV-46346 Cycle5 translation FR new files
2010-02-19 16:00:09 +08:00
5eea58d289
DEV-46346 Cycle5 translation FR
2010-02-19 15:59:58 +08:00
67ec499b33
DEV-46346 Cycle5 translation DE new files
2010-02-19 11:27:33 +08:00
7185ca51bc
DEV-46346 Cycle5 translation DE
2010-02-19 11:27:14 +08:00
b5b6fcb26d
DEV-46346 Cycle5 translation JA
2010-02-19 11:23:42 +08:00
fdc58823dc
DEV-46346 Cycle5 translation JA
2010-02-19 11:23:32 +08:00
8443f840bc
DEV-46346 Cycle4 linguistic change DE and JA
2010-02-19 11:13:40 +08:00
53d0929bf4
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2010-02-18 21:33:12 -05:00
6704b1ea7f
Automated merge with file:///Users/chuck/Documents/hg/viewer-hotfix
2010-02-18 21:32:53 -05:00
e0249da7fd
Automated merge with ssh://hg.lindenlab.com/q/viewer-hotfix
2010-02-18 21:28:10 -05:00
bb31822ca9
Finished (for now) side-panel cleanup.
...
http://jira.secondlife.com/browse/EXT-4335
2010-02-18 21:27:42 -05:00
63e2d18440
automerge
2010-02-18 21:00:10 -05:00
1df3ef8766
Backed out changeset 49e628c3a0c5 - further changes for reverting default/base changes.
2010-02-18 20:59:47 -05:00
c0ae5bb99b
Missed the CMake file in backing out changes
2010-02-18 20:48:41 -05:00
9dbe107f4e
move base back to default because doing it as a backout was causing merge errors
2010-02-18 20:37:37 -05:00
6b48a59c99
merge changes from backing out the directory change of default to base
2010-02-18 20:36:47 -05:00
2d00beeed2
Backed out cpp changes from changeset 49e628c3a0c5
2010-02-18 20:36:03 -05:00
c4b42ca78f
Reverting change 570851c5baa5
...
because it's broken
2010-02-18 19:54:34 -05:00
e0efa1dfa2
Automated merge with ssh://hg.lindenlab.com/q/viewer-hotfix
2010-02-18 15:48:56 -08:00
ef9b7c5b36
Fix for EXT-5120 "Mouse-up in the scrollbar to the right of a link in nearby 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-18 15:45:31 -08:00
890ec637d4
Automated merge with ssh://hg.lindenlab.com/q/viewer-hotfix
2010-02-18 15:22:10 -08:00
1d1e4c7abe
merge
2010-02-18 14:09:55 -08:00
7ed47f7225
fixed line endings
2010-02-18 13:58:57 -08:00
08e3e05c0a
Additional optimizations to text reflow for EXT-5071.
...
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-18 13:40:32 -08:00
9c2559924c
merge
2010-02-18 13:32:15 -08:00
3af609b55c
fixed some spacing munged by merge
2010-02-18 12:57:05 -08:00
876a764c4f
EXT-5535 - Resize handles will move floater when reaching minimum size
2010-02-18 12:49:31 -08:00
d742b3e911
Merge with tip
2010-02-18 11:22:17 -08:00
77009a366f
EXT-5363 webkit does not strip spaces off a typed-in URL
...
Reviewed by CB
2010-02-18 11:21:36 -08:00
4ab945c9f0
Merge - updating from hotfix
2010-02-18 10:59:09 -08:00
2231da11dd
EXT-4677 Crash when closing pinned menu which has no parent Inventory floater
...
Reviewed by Richard CC#118
2010-02-18 10:52:34 -08:00
4175268172
Merge
2010-02-18 10:32:52 -08:00
4514b57126
Backed out changeset: 744bd7c535fa
2010-02-18 10:29:56 -08:00
c4a3bee335
fixed major EXT-5493 “llInstantMessage sends message to "nearby chat" window,
...
but not to toasts in viewer”,
made llInstantMessage logged into nearby chat window and nearby chat toast;
--HG--
branch : product-engine
2010-02-18 20:21:02 +02:00
7f432e0858
EXT-5532 Remove any UI evidence of select-buffer rendering's existence
...
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-18 18:05:03 +00:00
ca6caad68c
merge
2010-02-18 09:25:04 -08:00
5e26566f48
Fixed low bug (EXT-5212) Add "Parcel Properties" and "Coordinates" to World->Show.
...
--HG--
branch : product-engine
2010-02-18 19:13:14 +02:00
Tofu Linden