summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2009-09-16mergeMark Palange (Mani)
2009-09-14DEV-39949 Normalize fonts across systemsAdam Moss
This attempts to be pretty close to the 80-20 style guide (sizewise probably a bit closer than we were before) while remaining pragmatically close to what we've already been using in viewer2. The main goal is to bring fonts to parity across all platforms to the extent that truncation issues and layout glitches need to be fixed and tested on only one platform, not 3+.
2009-09-14Merge with SVN viewer-2.0.0-3 branchBryan O'Sullivan
2009-09-14DEV-39188: Removed the custom support for secondlife:///app/events andMartin Reddy
secondlife:///app/classifieds URLs because we do not have handlers for these SLAPPs in 2.0. Added support for secondlife://<location/<x>/<y>/<z> URLs, in addition to the http://slurl.com SLURLs. Also optimized LLUrlRegistry:findUrl() so that it avoids lots of expensive regex calls when there is no URL in the text.
2009-09-14EXT-940 Add new art to viewer - 9/14/09Erica Olsen
2009-09-14DEV-35097 change 1 more instance of the term SLURL to the proper trademark ↵Ramzi Ramey
guideline, SLurl
2009-09-14DEV-15182 VWR-5474 SEC-20: re-enabled support for clicking on theMartin Reddy
following SLAPP URL types in an untrusted browser: secondlife:///app/agent/... secondlife:///app/group/... secondlife:///app/parcel/... In order to find a compromise between supporting these commands and security concerns over potential griefing vectors, we use a throttling solution when these commands are issued by untrusted web browsers. That is, we only process one command per 15 seconds. This applies to external browsers, like Firefox, as well as the internal SL browser. Notably, we continue to block secondlife:///app/teleport URLs. Reviewed by james.
2009-09-14DEV-39188: clicking on unsupported secondlife:///app/ SLURLs nowMartin Reddy
brings up a notification telling you this; rather than displaying the Place side panel with N/A information. Now, if you click on an Event or Classified SLURL, you get this unsupported alert (2.0 does not have side panels for these types of assets, instead they are integrated into Search).
2009-09-14EXT-804 Preferences > General does not show the static text, or combo_box ↵Jiao Li
for Maturity rating -- to be reviewed
2009-09-14People and Me panel layout changes - significantly closer to spec. Widened ↵Erica Olsen
sidebar to 313px. EXT-562 EXT-892
2009-09-13Adapt the build script so it can be invoked from a developer checkout.CG Linden
2009-09-13fixed type-o in textures.xmlErica Olsen
2009-09-13EXT-923 Add new art to viewer. Create references to AddItem OptionsMenu and ↵Erica Olsen
TrashItem Disabled states in xml. Link new art up in textures.xml.
2009-09-12EXT-562 Align title and Back button for panels to avoid "jumping" effects ↵Erica Olsen
EXT-892 Me panel has unnecessary horizontal scroll bar EXT-869 Only top part of "Map" button is visible in Picks panel - Reviewed by Richard
2009-09-11merge -r 1649-1651 ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/pe/stable-2@1648 -> viewer-2.0.0-3 Fixes: EXT-843 EXT-846 New Dev: EXT-514
2009-09-11merge ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1634 https://svn.aws.productengine.com/secondlife/pe/stable-2@1648 -> viewer-2.0.0-3 * Bugs: EXT-888 EXT-866 EXT-861 EXT-858 EXT-864 EXT-875 EXT-884 EXT-718 EXT-786 EXT-885 EXT-910 EXT-845 EXT-312 EXT-823 EXT-868 * New Development: EXT-748 EXT-863 EXT-835 QA: Please test Recent List to verify it has no troubles.
2009-09-11EXT-921 Return Avatar Rendering Cost to topmenuErica Olsen
2009-09-11For DEV-39666 : Ensure AgentWearables saves actual items, not links, to databaseLoren Shih
For backwards compatibility, this change ensures that links aren't saved to user_wearable. Reviewed by: Vir.
2009-09-11svn merge svn merge ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1614 https://svn.aws.productengine.com/secondlife/pe/stable-2@1618 -> viewer-2.0.0-3 * EXT-895
2009-09-10#ifdef'd out gmock and gtest for LL_WINDOWS. Does not appear to be needed ↵Steve Linden
and breaks the build.
2009-09-10Header file corrections to let us build without precompiled headers from ↵James Cook
llprimitive and llvfs. Allows better dependency analysis.
2009-09-10r128438 introduced a hilarious piece of mergefuckery about five weeks ago. ↵Adam Moss
eyeball this diff for a good laugh. I've verified that the evil twin is *identical*. reviewed by palmer.
2009-09-10revisit the fix for these:Adam Moss
DEV-30182 Tooltips lose their translucent background DEV-30508 Chat bar changes from white to dark upon text entry DEV-30830 Text color change after UI size change DEV-30751 Create object Name text field is grey out reviewed by Q.
2009-09-10DEV-38453 (more part 1)Ramzi Ramey
- change old <combo_item> nodes to the new <combo_box.item>
2009-09-10For DEV-34223: Avatar Pipeline Project - M6 (Current Outfit Folder, ↵Bradley Payne
Appearance Side Panel) - brought merge branch changes from avatar-pipeline/viewer-2.0.0-3_cwf-7_merge into viewer-2.0.0-3. svn merge -r132878:132947 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/viewer-2.0.0-3_cwf-7_merge
2009-09-10add'l EXT-883: add a few needed tooltips to buttons on Build floaterRamzi Ramey
2009-09-10Automated merge with http://hg.lindenlab.com/viewer/viewer-20/Bryan O'Sullivan
2009-09-10Fix a link error with an integration test on OS X.Bryan O'Sullivan
2009-09-10merge -r 1609-1612 https://svn.aws.productengine.com/secondlife/pe/stable-2 ↵Steven Bennetts
-> viewer-2.0.0-3 Fixes: EXT-825 EXT-893 EXT-889 EXT-88
2009-09-10merge ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1602 https://svn.aws.productengine.com/secondlife/pe/stable-2@1608 -> viewer-2.0.0-3 * Bugs: EXT-848 EXT-865 * New Dev: EXT-790 EXT-822
2009-09-09Merge with SVN viewer-2.0.0-3 branchBryan O'Sullivan
2009-09-09DEV-39537: Moved the toHTTPDateString tests into llhttpdate_tut.cpp,Martin Reddy
as a more appropriate home. Also made use of the skip() method rather than use printf() - thanks to tofu for the suggestion.
2009-09-09Xcode 3.2 line-ending warningBrian McGroarty
2009-09-09Reenable freetype-2.3.9 for win32 (DEV-32831)Brad Kittenbrink
svn merge -c 131881 . parabuild succeeded building this in branches/brad/freetype-2.3.9-upgrade/ so it had better work here...
2009-09-09DEV-39441: Removed include for boost/regex.hpp from llstring.h (andMartin Reddy
fixed up viewer files that relied on this being included for them). Also changed LLStringUtil::getSubstitution() to be a private method. Reviewed by steve.
2009-09-09Fix for DEV-39442: Increased the performance of LLDate::toHTTPDateStringMartin Reddy
by over 50 times. Looking at the usage, toHTTPDateStream is not called anywhere (except internally by toHTTPDateString), and toHTTPDateString is called only once outside of lldate.cpp, by LLStringUtil::formatDatetime. Also, the method is most commonly called with a single two-character token, such as "%Y" or "%A". I therefore removed toHTTPDateStream and optimized toHTTPDateString. Setting the locale was the most expensive operation, so I looked into caching that, both in terms of std::ostream and strftime. The timings for those implementations (averaged over 10 calls) is: toHTTPDateString timings: - with ostream (current) -> 0.314156 ms - with ostream and std::locale caching -> 0.033999 ms - with strftime and setlocale() caching -> 0.005985 ms I therefore went with the standard C library strftime solution. I also wrote a few unit tests to make sure that I didn't break any existing functionality, and tested this under Windows and Linux. Reviewed by steve.
2009-09-09fix media test app -- reviewed by jamesJiao Li
2009-09-09merge -r 1586-1593 https://svn.aws.productengine.com/secondlife/pe/stable-2 ↵Steven Bennetts
-> viewer-2.0.0-3 Fixes: EXT-839 EXT-859 EXT-868 EXT-795 EXT-861 EXT-678 EXT-848 EXT-873
2009-09-09merge merge ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1581 https://svn.aws.productengine.com/secondlife/pe/stable-2@1585 -> viewer-2.0.0-3 * Bugs: EXT-838 EXT-815 EXT-872 * New Dev: IM Floater Docking
2009-09-09EXT-883 Match build tools to 2.0 visual styleErica Olsen
2009-09-09merge -r132032-132812 ↵Richard Nelson
svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1
2009-09-08Merge from trunkBryan O'Sullivan
2009-09-08Remove llfasttimer.h from linden_common.h, not necessary and adds 15K lines ↵James Cook
of header code to every library .cpp file.
2009-09-08MergeBryan O'Sullivan
2009-09-08MergeBryan O'Sullivan
2009-09-08Fix some linking problems for tests.Bryan O'Sullivan
2009-09-08Floatercram the Report Abuse floater to fit in the side tray. EXT-756Kurt Stauffacher
2009-09-08MergeBryan O'Sullivan
2009-09-08Merge with SVN trunkBryan O'Sullivan
2009-09-08Fix deprecated conversion from string constant to ‘char*’ warningsMartin Reddy
that occur under gcc 4.3 for DEV-39457. This fixes the indra/test C++ unit tests under Linux.