Commit Graph

10776 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author SHA1 Message Date
Erica 4e3f00fcad EXT-2450 Extra column in Group panel memberlist 2009-12-03 16:06:33 -08:00
Nat Goodspeed 25b6b5929e Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2009-12-03 15:58:22 -08:00
James Cook 275b4f5849 merge 2009-12-03 15:30:49 -08:00
James Cook 2add7f7045 Added floater_test_text_editor, hooked up UI tests to login Debug menu
Reviewed with Leyla
2009-12-03 15:21:04 -08:00
James Cook 2fe5e55f4f Hack for EXT-2971 Letter R doesn't show when it's the last letter in a text block.
Add 1 pixel of padding to clipping rect computation.  I think there is a deeper
problem in the font width computation code, but I don't know where.  Opened EXT-3112
for the deeper issue.  Reviewed with Leyla.
2009-12-03 15:20:21 -08:00
Nat Goodspeed 3370a87ff5 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2009-12-03 14:57:20 -08:00
Erica 9388a1a938 fixed window resize alignment problem in login form 2009-12-03 14:42:41 -08:00
skolb ea7b5d312c Merge 2009-12-03 14:40:53 -08:00
Rick Pasetto d9a22f6678 Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/ 2009-12-03 14:34:03 -08:00
skolb faa188322a Merge 2009-12-03 14:33:38 -08:00
Nat Goodspeed 3d463ec43e Work around Linux viewer test program catch failure 2009-12-03 13:51:44 -08:00
Mark Palange (Mani) 4535fd64fb Merge 2009-12-03 13:21:32 -08:00
James Cook 522fa62487 merge 2009-12-03 13:11:57 -08:00
Mark Palange (Mani) 5729a0a6a3 Fix to windows build breakages.
Reviewed by Brad
2009-12-03 13:11:35 -08:00
James Cook d566f187a3 Fix Linux build, file missing newline at end of file 2009-12-03 13:11:09 -08:00
Nyx (Neal Orman) 4dd8d2ccb6 Automated merge with ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0/
--HG--
branch : avatar-pipeline
2009-12-03 16:05:14 -05:00
Nyx (Neal Orman) 94d77ac20f Fixing hair alpha mask borkage by previous alpha mask patches
Forgot hair alpha cutoff levels should be default for better blending.

Code reviewed by Bigpapi

--HG--
branch : avatar-pipeline
2009-12-03 16:02:07 -05:00
Loren Shih 1ffd7c99af automated merge for avp->avp
--HG--
branch : avatar-pipeline
2009-12-03 15:41:36 -05:00
Loren Shih 202d86b155 EXT-2410 : Accepting an offered item should open the inventorySP
Added a new "Quiet" query for folder types, so I don't have to special case all the folders where we don't want UI notifications from inventory offers.
Fixed a bug where a sidepanel was considered active even if the sidetray was closed.

--HG--
branch : avatar-pipeline
2009-12-03 15:39:43 -05:00
Erica 90c42f0e5a Automated merge with ssh://hg.lindenlab.com/james/gooey 2009-12-03 12:28:55 -08:00
Erica 329cdc33da Final layout changes to about land, new widget sizes, EXT-3027 About Land dialog:Media panel layout issues 2009-12-03 12:28:40 -08:00
Justin C. Rounds (Chuck) 301f6b45ca Updated to add ellipses on long descriptions, and added a margin beneath the description to keep it from running into the text below.
http://jira.secondlife.com/browse/EXT-2995
2009-12-03 15:19:03 -05:00
Rick Pasetto ff53d4ff9b Fix Windows build based on API change to handleDragNDrop() 2009-12-03 12:19:02 -08:00
Steve Bennetts a0b4aa14d8 Merge from product-engine 2009-12-03 12:15:47 -08:00
Steve Bennetts a5c5a6598c Un-threaded LLTextureFetch to address potential performance and edge case crash issues.
Changed an assert to an llerrs with extra info
Added "HTTP Textures" to "Develop" menu
2009-12-03 12:07:18 -08:00
Steve Bennetts 2d3f9a4832 Fixed a crash when clearing private data twice. 2009-12-03 12:05:50 -08:00
Rick Pasetto 0a2a52c3b1 Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/ 2009-12-03 11:55:43 -08:00
Nat Goodspeed 18901432e9 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2009-12-03 11:51:50 -08:00
Rick Pasetto 57195ccd74 Automated merge with ssh://rick@hg.lindenlab.com/rick/viewer-2-0-rickcallum 2009-12-03 11:51:15 -08:00
Rick Pasetto c272582ab7 Change API to no longer include slurl argument (its a platform-agnostic policy), add some code (not working yet) to implement DND on the mac 2009-12-03 11:48:28 -08:00
skolb ec34503e01 local merge 2009-12-03 11:40:18 -08:00
Rick Pasetto 8752f020fc Don't show controls if build tools are up 2009-12-03 11:37:51 -08:00
Monroe Linden cfe5ac7684 Fix for DEV-43696 (media streams should have hard limit of 8)
This was just an off-by-one error in the hard limit calculation (> instead of >=).
2009-12-03 11:34:53 -08:00
Justin C. Rounds (Chuck) 1f05abec61 Automated merge with ssh://chuck@hg.lindenlab.com/james/gooey/ 2009-12-03 14:33:07 -05:00
Justin C. Rounds (Chuck) 60bbeeb0c0 Changed ChatToastAgentNameColor to EmphasisColor.
http://jira.secondlife.com/browse/EXT-3072
2009-12-03 14:32:05 -05:00
Rick Pasetto 42fbb0abcd remove fudge factor for controls background rendering 2009-12-03 11:28:26 -08:00
Loren Shih e23d517007 EXT-2410 : Accepting an offered notecard should open the inventorySP
Added logic to choose the side panel if it's open, or open the side panel if no other inventory panels are open.

--HG--
branch : avatar-pipeline
2009-12-03 14:06:08 -05:00
Eric M. Tulla (BigPapi) ed0596cfc7 merge of avatar-pipeline branch into viewer2 2009-12-03 13:58:14 -05:00
James Cook 4feca85dfa EXT-2966 Parcel property icons on nav bar have no tool-tips
Added tooltips in strings.xml so they can be localized.
2009-12-03 10:54:43 -08:00
brad kittenbrink bf4f21ecf8 Merge of include dependency cleanup work with viewer-2-0 2009-12-03 10:41:31 -08:00
Brad Payne (Vir Linden) a9609ae155 merge
--HG--
branch : avatar-pipeline
2009-12-03 13:35:44 -05:00
Nat Goodspeed d805fab31e DEV-43463: swap visit_and_connect() overloads for Linux compiler 2009-12-03 10:01:23 -08:00
Erica bbdfd84e2a moved start location dropdown 2009-12-03 09:52:05 -08:00
skolb 1de537d1bd Fixed broken build 2009-12-03 09:43:50 -08:00
James Cook 6c2101a44e EXT-2984 Fixed crash in LLNormalTextSegment::getDimensions (no repro)
Avoid stepping off end of array when text segment has 0 characters
Reviewed with Ambroff
2009-12-03 09:32:05 -08:00
Rick Pasetto 035d096b91 Automated merge with ssh://rick@hg.lindenlab.com/skolb/media 2009-12-03 09:23:41 -08:00
skolb 7851819c88 local merge 2009-12-03 09:18:11 -08:00
Nat Goodspeed 5fd2938da8 Merge with recent viewer-2-0 2009-12-03 09:17:51 -08:00
Nat Goodspeed 97f97f286c Skip logging test that fails on Linux, no idea why 2009-12-03 09:14:17 -08:00
Eric M. Tulla (BigPapi) b05ebd8977 merge of viewer2 into avp branch
--HG--
branch : avatar-pipeline
2009-12-03 12:09:16 -05:00