Commits

Show all
Author Commit Message Labels Comments Date
Bryan O'Sullivan
Merge with SVN viewer-2.0.0-3 branch
Tags
alpha-3
Bryan O'Sullivan
Trivial commit for hg import purposes
Bryan O'Sullivan
Sync up with a number of SVN changes that snuck in via weird merges
nat_linden
DEV-34522: [COMMENTS ONLY] clean up comments about (formerly) disabled tests
Christian Goetze
Fix syntax error introduced by your's truely into develop.py
Steven Bennetts
EXT-791 - Add "Pause Agent" option to the Debug > Network menu
Christian Goetze
Add retry logic on certain exit codes
Kurt Stauffacher
Updated Me Profile and spec generated by 80/20. Removed Edit options for public profile display. Description of task in EXT-770
Sam Kolb
Removed some final dependencies to Awesomium and Flash ActiveX (mostly porting over Callum's change: r132166) DEV-39138 build process on parabuild fails due to missing flash activex plugin
Erica Olsen
EXT-785 Remove old art resources from viewer
CG Linden
Also quite the backslashes in the argument for the sign command
CG Linden
Quote any backslashes so they get preserved when invoking python.
CG Linden
Fix syntax error in viewer_manifest.py
CG Linden
Attempt to invoke the code signer differently
CG Linden
Port over the new build scripts from para-test, tweek update_version_files to use the repo revision number for now.
Adam Moss
sheesh, finish(?) gutting the flash stuff out of DEV-31438
Kurt Stauffacher
Updated Me Profile and Me Edit Profile xml files to match new spec generated by 80/20. Description of task in EXT-770
Adam Moss
svn merge -r130875:131962 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05_newllqtwebkit DEV-31438 Rename LLMozLib (Qt/WebKit) to something else - LLQtWebKit
Erica Olsen
Standardized layouts, changed commitment model labels to ok/cancel, modernized advanced floaters.
Steven Bennetts
Partial merge of: viewer-2.0.0-3@131138 texture-pipeline-3@131862 -> viewer-2.0.0-3 Includes: * DEV-31909 VWR-13251: Revise lscript_library.cpp to allow localization of LSL editor hovertips * DEV-21938 llSHA1String does not appear where expected in the dropdown "Insert" menu in the LSL editor * Some cleanup to llerror so that it doesn't depend on llfixedbuffer * A few misc. server specific changes not related to the texture-pipeline changes (llapp, lloptioninterface)
Steven Bennetts
EXT-729 - moved XML from menu_minimap.xml to menu_mini_map.xml and deleted menu_minimap.xml (translations all have menu_mini_map.xml)
Steven Bennetts
EXT-614 Object inventory does not update to show inventory created or placed in the object. Reviewed by: Seraph
Monroe Linden
svn merge -r 132139:132140 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-5 In the webkit plugin, don't try to load web browser plugins except on Windows. The flash plugin on the Mac crashes the webkit plugin when running under xcode.
Steven Bennetts
svn merge -r 1490-1500 https://svn.aws.productengine.com/secondlife/pe/stable-2 Bug Fixes: * EXT-637 EXT-595 Dev work: * EXT-694 QA: * Be sure feature works on other locales Known issues: * If old Calling Card of person who presents in the friend list is removed - "Do you want to remove ..." dialog is shown, if old Calling Card of non-friend is removed it is removed in the old way without any alerts. * It is possible to create 2 deep level subfolders under the Calling Cards/F…
Steven Bennetts
svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1480 https://svn.aws.productengine.com/secondlife/pe/stable-2@1489 -> viewer-2.0.0-3 * EXT-97 EXT-576 EXT-593 EXT-613 EXT-649 EXT-697 EXT-707 EXT-708 EXT-726 EXT-737
Steven Bennetts
Updated eol properties on .xml files Added test_apps to ignore list
nat_linden
DEV-38596: Introduce Mani's LL_ADD_INTEGRATION_TEST macro. LL_ADD_INTEGRATION_TEST supports tests that may require linking against one or more Linden libraries, or that should be executed with a wrapper script. Use this to test lllazy.cpp, llsdmessage.cpp and llcapabilitylistener.cpp.
James Cook
skinning-22 -> viewer-2 trunk to pick up bug fixes, including crash on script compile when cursor is at the end of the script editor window. Replaced panel_pick_info.xml and panel_profile_view.xml with our versions, which stomped some PE changes. Panels still work, however, and Kurt is still working on layout. CHANGES: minor layout change: "start location" and "remember password" weren't on the same horizontal line. DEV-35120 image_unselected art was "transparent.j2c" - switched it out for PushButton_Off I18N: more things are missing a.. you guessed it, a name= parameter. Breaks localization. forgot to check this in earlier...fixes off-by-one crash when editing a script DEV-36740 change the displaye…
Steven Bennetts
DEV-38942 Eliminate startModal() from LLModalDialog Also moved TOS and Critical floaters to login debug menu for testing
Monroe Linden
svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910 svn merge -r 129913:131718 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05 Some branch shenannigans in the pluginapi_05 branch caused this to become a two-part merge.
  1. Prev
  2. Next