summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2009-09-18Added dependcies to create_app_config_file.Mark Palange (Mani)
Further Clean up of dll copying merge mess.
2009-09-18Minor tweaks of test_win32_manifest output.brad kittenbrink
2009-09-18Merged my recent viewer/viewer-20 + login-api merge with latest login-api ↵brad kittenbrink
including DLL hell library changes.
2009-09-18Fixups for LLStringUtil link errors after the merge.brad kittenbrink
2009-09-18Merged latest viewer/viewer-20 into login-api.brad kittenbrink
2009-09-18Applied patch for SLPlugin location from:Mark Palange (Mani)
r133676 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-6
2009-09-17Merged in my CRT dll hell library changes.brad kittenbrink
2009-09-17Rebuilt windows boost for CRT version DLL hell, upgrading to 1.39 in the ↵brad kittenbrink
process.
2009-09-16Relocate build.sh to the top of the source tree.CG Linden
2009-09-16mergeMark Palange (Mani)
2009-09-15More specific exepction handling to support correct crt_checking failures.Mark Palange (Mani)
2009-09-15mergeMark Palange (Mani)
2009-09-15Fixed up CopyWinLibs.cmake post moap/viewer-2.0.0-3 merge.Mark Palange (Mani)
Added CRT assembly check to viewer_manifest.py. twiddled test_win32_manifest.py for ease of use.
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-38598: More closely align new login-failure control flow with viewer-2.Nat Goodspeed
In the viewer-2 code base, the "tos" case is detected inline, a sibling of the other types of login failure, and doesn't reach the notification. Our new logic needs to detect "tos" as well. Also, the case of process_login_success_response() returning false was inconsistent, attempting a notification with an empty string.
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-14QAR-1619: reconcile redundant SLPlugin.exe copy_if_different with ↵Nat Goodspeed
viewer_manifest.py
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-14Merge changesNat Goodspeed
2009-09-14QAR-1619: At Sam's request, move SLPlugin to viewer executable dir, ↵Nat Goodspeed
consistent with Mac and Linux.
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-12DEV-38598: remove dangerous compare-LLSD-less-than operationNat Goodspeed
2009-09-11DEV-38598, QAR-1619: Ensure we remove LLFloaterTOS from LLFloaterReg registry.Nat Goodspeed
LLFloater's destructor calls LLFloaterReg::removeInstance() with its own name and key. But for the new LLFloaterTOS invocation, we pass a key that's an LLSD map. removeInstance() critically depends on LLFloater::KeyCompare::equate() -- but equate() never considered a non-scalar LLSD key value. Fortunately llsdutil.h already provides a deep-equality function for LLSD: llsd_equals(). Making equate() trivially call llsd_equals() fixes the crash on TOS cancel.
2009-09-11QAR-1619: Reconcile LLFloaterTOS::onCancel() with viewer-2 version.Nat Goodspeed
The viewer-2 onCancel() pops up a "MustAgreeToLogIn" notification. Make ours do the same.
2009-09-11QAR-1619: Remove unneeded llfloatertos.h #includes.Nat Goodspeed
Neither lllogininstance.cpp nor lllogininstance_test.cpp need llfloatertos.h any more, since LLLoginInstance talks to LLFloaterTOS only via LLFloaterReg and LLEventPumps. However, both sources depended on llfloatertos.h dragging in llnotifications.h, so include that explicitly instead of llfloatertos.h.
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-10Merge changesNat Goodspeed
2009-09-10Header file corrections to let us build without precompiled headers from ↵James Cook
llprimitive and llvfs. Allows better dependency analysis.
2009-09-10QAR-1619: move Linux SLPlugin executable to the viewer executable directoryNat Goodspeed
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