Commit Graph

7453 Commits (8443f840bcf3db538a7b2a705bd9ee0a21f4e6c7)

Author SHA1 Message Date
Eli Linden 8443f840bc DEV-46346 Cycle4 linguistic change DE and JA 2010-02-19 11:13:40 +08:00
Chuck Linden 53d0929bf4 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2010-02-18 21:33:12 -05:00
Chuck Linden 6704b1ea7f Automated merge with file:///Users/chuck/Documents/hg/viewer-hotfix 2010-02-18 21:32:53 -05:00
Chuck Linden e0249da7fd Automated merge with ssh://hg.lindenlab.com/q/viewer-hotfix 2010-02-18 21:28:10 -05:00
Chuck Linden bb31822ca9 Finished (for now) side-panel cleanup.
http://jira.secondlife.com/browse/EXT-4335
2010-02-18 21:27:42 -05:00
Kent Quirk 63e2d18440 automerge 2010-02-18 21:00:10 -05:00
Kent Quirk 1df3ef8766 Backed out changeset 49e628c3a0c5 - further changes for reverting default/base changes. 2010-02-18 20:59:47 -05:00
Kent Quirk c0ae5bb99b Missed the CMake file in backing out changes 2010-02-18 20:48:41 -05:00
Kent Quirk 9dbe107f4e move base back to default because doing it as a backout was causing merge errors 2010-02-18 20:37:37 -05:00
Kent Quirk 6b48a59c99 merge changes from backing out the directory change of default to base 2010-02-18 20:36:47 -05:00
Kent Quirk 2d00beeed2 Backed out cpp changes from changeset 49e628c3a0c5 2010-02-18 20:36:03 -05:00
Kent Quirk c4b42ca78f Reverting change 570851c5baa5
because it's broken
2010-02-18 19:54:34 -05:00
Monroe Linden e0efa1dfa2 Automated merge with ssh://hg.lindenlab.com/q/viewer-hotfix 2010-02-18 15:48:56 -08:00
Monroe Linden 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
Monroe Linden 890ec637d4 Automated merge with ssh://hg.lindenlab.com/q/viewer-hotfix 2010-02-18 15:22:10 -08:00
richard 1d1e4c7abe merge 2010-02-18 14:09:55 -08:00
richard 7ed47f7225 fixed line endings 2010-02-18 13:58:57 -08:00
Monroe Linden 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
richard 9c2559924c merge 2010-02-18 13:32:15 -08:00
richard 3af609b55c fixed some spacing munged by merge 2010-02-18 12:57:05 -08:00
richard 876a764c4f EXT-5535 - Resize handles will move floater when reaching minimum size 2010-02-18 12:49:31 -08:00
Callum Prentice d742b3e911 Merge with tip 2010-02-18 11:22:17 -08:00
Callum Prentice 77009a366f EXT-5363 webkit does not strip spaces off a typed-in URL
Reviewed by CB
2010-02-18 11:21:36 -08:00
Leyla Farazha 4ab945c9f0 Merge - updating from hotfix 2010-02-18 10:59:09 -08:00
Leyla Farazha 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
richard 4175268172 Merge 2010-02-18 10:32:52 -08:00
richard 4514b57126 Backed out changeset: 744bd7c535fa 2010-02-18 10:29:56 -08:00
Tofu Linden 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
richard ca6caad68c merge 2010-02-18 09:25:04 -08:00
Tofu Linden b5f9e437ea PE merge. 2010-02-18 16:57:52 +00:00
Lynx Linden 67af47fd86 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2010-02-18 16:48:40 +00:00
Lynx Linden 023bbc608d DEV-44136: Don't show previous search results when opening Find floater.
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-18 16:48:02 +00:00
Mike Antipov 8e134590e6 Fixed low bug EXT-871 ("Stop Flying" button isn't displayed after standing up)
- 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-18 18:42:31 +02:00
Chuck Linden a226668381 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2010-02-18 11:14:52 -05:00
Chuck Linden 1ca9c1dcfe Automated merge with file:///Users/chuck/Documents/hg/viewer-hotfix 2010-02-18 11:13:54 -05:00
Alexei Arabadji 1933a378ea Corrected embedded notification panel message index in session list;
--HG--
branch : product-engine
2010-02-18 17:51:06 +02:00
Lynx Linden c44b25abe2 EXT-5461: Reverting change 49e628c3a0c5.
Renaming skins/base back to skins/default to unblock I10n.

Revert was requested by Q.
2010-02-18 15:03:03 +00:00
Lynx Linden b71f451b76 EXT-5461: Reverting change 49e628c3a0c5.
Renaming skins/base back to skins/default to unblock I10n.

Revert was requested by Q.
2010-02-18 15:03:03 +00:00
Alexei Arabadji eec9f20d74 fixed EXT-5006 “One inventory offer cause blinking of both Conversations and
Notifications wells”,
embedded inventory offer panel into IM window;

--HG--
branch : product-engine
2010-02-18 16:05:11 +02:00
Tofu Linden fa03910a34 merge. 2010-02-18 13:54:31 +00:00
Vadim Savchuk f33a1d7ad9 merge
--HG--
branch : product-engine
2010-02-18 15:45:48 +02:00
Tofu Linden 7f3b3d3bd6 EXT-5389 Unreadable resident names with glow. 2010-02-18 13:43:42 +00:00
Paul Guslisty a52a761460 Fixed normal bug EXT - 5426 (Invalid message is shown while viewing empty picks tab of another avata)
- Added particular messages for 'PICKS' and 'My Picks' tabs in MyProfile and People panels appropriately. Before there was one message for these tabs.

--HG--
branch : product-engine
2010-02-18 15:19:57 +02:00
Ychebotarev ProductEngine c8fec65544 merge
--HG--
branch : product-engine
2010-02-18 15:01:01 +02:00
Ychebotarev ProductEngine ed46f84873 fix for major EXT-4937 Texture Preview floater doesn't resize to match the aspect ratio of the viewed image
--HG--
branch : product-engine
2010-02-18 15:00:16 +02:00
Dmitry Zaporozhan 25800b4b37 Fixed normal bug EXT-5468 - Lists from people panel are not refreshed after filter field has been reseted by (x).
--HG--
branch : product-engine
2010-02-18 14:43:46 +02:00
Aimee Linden 5ab2980f9c merge with ssh://hg.lindenlab.com/q/viewer-hotfix/ 2010-02-18 12:11:51 +00:00
Aimee Linden 1ae70e112a EXT-5370: Voice volumes set for other agents reverting between voice sessions
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-18 12:04:21 +00:00
Tofu Linden 5b4ded5115 more cleanup of some dead members. 2010-02-18 11:38:09 +00:00
Tofu Linden 35852af8d8 minor cleanup in prep for EXT-5389 2010-02-18 11:14:33 +00:00