summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2009-09-04Fix for link errors referencing operator!=(LLURI const &, LLURI const &) ↵brad kittenbrink
from integration tests.
2009-09-04QAR-1619: Replace RunBuildTest.cmake with run_build_test.py for LSL tests.Nat Goodspeed
RunBuildTest.cmake can't handle pathnames containing spaces. run_build_test.py accepts an arbitrary number of individually-quoted command-line arguments, passing each through to Python's subprocess.call().
2009-09-03fix for build_win32_appConfig.py failing to find Microsoft.VC80.CRT.manifest ↵brad kittenbrink
on clean builds. the "Copying staged dlls" pre-build step for newview got moved to be a pre-build step for create_app_config_file and create_app_config_file now depends on stage_third_party_libs. reviewed by Nat.
2009-09-03Merge changesNat Goodspeed
2009-09-03QAR-1619: Fix Windows link errors when building INTEGRATION_TEST_lllazy.Nat Goodspeed
The problem arose because we were setting LL_COMMON_BUILD in llcommon/CMakeLists.txt, not only for the library build itself but also for its LL_ADD_INTEGRATION_TEST tests. This told all the headers compiled into the INTEGRATION_TEST_lllazy executable that the executable was providing all the llcommon symbols, rather than importing them. The solution is to switch to the llcommon_EXPORTS symbol automagically defined by CMake when building the llcommon shared library itself.
2009-09-02On Mac, move SLPlugin executable to the same directory as the viewer executable.Nat Goodspeed
Change LLDir_Mac::getLLPluginLauncher() to look in the viewer's executable dir instead of in the plugins dir. Change viewer_manifest.py's DarwinManifest.construct() to put SLPlugin in the new location. SLPlugin is being linked with our new libllcommon.dylib, which self-identifies as being findable via @executable_path/../Resources/libllcommon.dylib. This doesn't work from the Resources/llplugin subdir -- the above relative path ends up looking in the nonexistent Resources/Resources subdirectory. Putting SLPlugin in the Contents/MacOS directory with the viewer executable solves the problem.
2009-09-01Merge whitespace-only changesNat Goodspeed
2009-09-01RunBuildTest.cmake definitely needs the separate_arguments() command, elseNat Goodspeed
when you pass in a command string with command-line arguments, RunBuildTest.cmake attempts to search for a program whose filename is the entire command line. Uncommented separate_arguments(). Added SHARED_LIB_STAGING_DIR to LL_ADD_INTEGRATION_TEST LD_LIBRARY_PATH.
2009-09-01Fixups for eol-style copy pasta...brad kittenbrink
2009-09-01Fixup for closing paren dropped in the merge.brad kittenbrink
2009-09-01Merged login-api with viewer-2.0.0-3 up through r132290.brad kittenbrink
2009-09-01Merged in nat's ucontext fix on osx 10.5.brad kittenbrink
2009-09-01DEV-34522: [COMMENTS ONLY] clean up comments about (formerly) disabled testsNat Goodspeed
2009-09-01Fix syntax error introduced by your's truely into develop.pyChristian Goetze
2009-09-01EXT-791 - Add "Pause Agent" option to the Debug > Network menuSteven Bennetts
2009-09-01Add retry logic on certain exit codesChristian Goetze
2009-08-31Post-merge cleanups (ported llstartup.cpp changes to where the surrounding ↵brad kittenbrink
code has been moved to in LLLoginInstance and LLAppViewer)
2009-08-31Updated Me Profile and spec generated by 80/20. Removed Edit options for ↵Kurt Stauffacher
public profile display. Description of task in EXT-770
2009-08-31Removed some final dependencies to Awesomium and Flash ActiveX (mostly ↵Sam Kolb
porting over Callum's change: r132166) DEV-39138 build process on parabuild fails due to missing flash activex plugin
2009-08-31Post-merge cleanups (adding LL_COMMON_API declarations)brad kittenbrink
2009-08-31Post-merge cleanups (stage_third_party_libs is the new copy_win_libs)brad kittenbrink
2009-08-31EXT-785 Remove old art resources from viewerErica Olsen
2009-08-31sheesh, finish(?) gutting the flash stuff out of DEV-31438Adam Moss
2009-08-31Updated Me Profile and Me Edit Profile xml files to match new spec generated ↵Kurt Stauffacher
by 80/20. Description of task in EXT-770
2009-08-31svn merge -r130875:131962 ↵Adam Moss
svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05_newllqtwebkit DEV-31438 Rename LLMozLib (Qt/WebKit) to something else - LLQtWebKit
2009-08-31Standardized layouts, changed commitment model labels to ok/cancel, ↵Erica Olsen
modernized advanced floaters.
2009-08-29Add magic -D switch to work around OS X 10.5 bug in ucontext.hNat Goodspeed
2009-08-29Partial merge of: viewer-2.0.0-3@131138 texture-pipeline-3@131862 -> ↵Steven Bennetts
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)
2009-08-29EXT-729 - moved XML from menu_minimap.xml to menu_mini_map.xml and deleted ↵Steven Bennetts
menu_minimap.xml (translations all have menu_mini_map.xml)
2009-08-29EXT-614 Object inventory does not update to show inventory created or placed ↵Steven Bennetts
in the object. Reviewed by: Seraph
2009-08-29svn merge -r 132139:132140 ↵Monroe Williams
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.
2009-08-28svn merge -r 1490-1500 https://svn.aws.productengine.com/secondlife/pe/stable-2Steven Bennetts
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/Friends/ subfolders. This should be disabled due to Accordion does not support tree hierarchy. * If friendship is removed when agent is offline, Friend Card is not removed from Inventory.
2009-08-28svn merge ↵Steven Bennetts
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
2009-08-28Updated eol properties on .xml filesSteven Bennetts
Added test_apps to ignore list
2009-08-28DEV-38596: Introduce Mani's LL_ADD_INTEGRATION_TEST macro.Nat Goodspeed
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.
2009-08-28skinning-22 -> viewer-2 trunk to pick up bug fixes, including crash on ↵James Cook
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 displayed string per Erica's request re 'You can only set your Home Location...' VIEWER-SIDE text change. This does not change the actual message coming from the server EXT-689 Odd spinner behaviour - For Sale Price -- reviewed by james DEV-26973 Internationalize the server msg Youcan'tset this place as home -- reviewed by james EXT-618 Low/Mid/High response is broken in Preferences > Graphics -- reviewed by james EXT-618 Low/Mid/High response is broken in Preferences > Graphics -- to be reviewed EXT-655 Cannot choose Both logging options in Preferences -- to be reviewed Changes to notifications.xml text to fit Style Guide and some renamed menu items EXT-147 Ongoing revisions to new gestures layout. DEV-35097 catch more instances of 'SLURL' and make them 'SLurl' Removed Info Displays and Buy Currency Test from top menus. Clean up code to use proper childGetFoo and childSetFoo calls, as well as setCommitCallback using slots. De-inlined LLAvatarIconCtrl paramblock constructor because I was doing a full rebuild anyhow. Commented about use of childSetCommitCallback(). De-inlined LocalizedString paramblock constructor. eliminated memory leak I18N: more things are missing a name= parameter, breaks localization. EXT-714 Updated panels in sidetray that were not using the scroll_container element to adjust for viewer heights. fix for llmessage_test crash in Windows Release builds DEV-11254 I18N: replace all string instances of "Second Life" - do this in the foreign languages too DEV-11254 I18N: replace all string instances of "Second Life" - found new instances from merged code potential fix for unit test crash on parabuild, moved statics into singleton member variables to get around potential dual instantation of statics on different modules DEV-36809 Click target for slider handles is too small -- reviewed by steve EXT-403 change getChild<LLSpiner> to LLUICtrl to make it generic -- reviewed by richard DEV-35938 Horizontal scroll thumb too high -- to be reviewed EXT-386 clean up warnings - initCommitCallback... Rename Product Engine's LLFloaterMiniInspector to LLInspectAvatar, clean up XUI XML, clean up construction code, move refresh method to postBuild() so widgets are constructed before refresh, fixed a member variable in llavatarlistitem.cpp. Reviewed with Leyla. Login menu > Debug > Avatar Inspector shows test avatar inspector. Also added to main menu > Debug > XUI > Avatar Inspector. Changed text/layout of dummy inspector. Not reviewed. Merging revisions 131558-131975 of svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-22 into D:\viewer-2.0.0-3, respecting ancestry
2009-08-28DEV-38942 Eliminate startModal() from LLModalDialogSteven Bennetts
Also moved TOS and Critical floaters to login debug menu for testing
2009-08-27Merged latest login-api with latest viewer-2.0.0-3 up through plugin-api-05 ↵brad kittenbrink
merge (r131929). Some minor post-merge cleanups still required.
2009-08-27svn merge -r 129841:129910 ↵Monroe Williams
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.
2009-08-27svn merge -c-131881 .Adam Moss
back-out DEV-32831 it annoys install.py but goodness knows why.
2009-08-27DEV-32831 Win32: freetype 2.3.9 upgradeAdam Moss
patch by brad.
2009-08-26EXT-730 - Crash in LLHUDEffectLookAt::calcTargetPositionSteven Bennetts
2009-08-26svn merge ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3 EXT-65 EXT-270 EXT-359 EXT-361 EXT-367 EXT-367 EXT-368 EXT-455 EXT-468 EXT-530 EXT-539 EXT-540 EXT-542 EXT-545 EXT-555 EXT-557 EXT-558 EXT-559 EXT-559 EXT-560 EXT-561 EXT-562 EXT-563 EXT-564 EXT-566 EXT-568 EXT-569 EXT-570 EXT-571 EXT-581 EXT-590 EXT-594 EXT-596 EXT-597 EXT-601 EXT-602 EXT-603 EXT-613 EXT-620 EXT-624 EXT-628 EXT-630 EXT-631 EXT-632 EXT-639 EXT-640 EXT-641 EXT-642 EXT-662 EXT-671 EXT-672 EXT-676 EXT-682 EXT-692 EXT-703 EXT-717
2009-08-26DEV-37428 - add adult_compliant flag to startup sequence so that 2.x viewer ↵Kent Quirk
properly identifies itself as capable of handling the adult information.
2009-08-24attempt at fix for windows build errorRichard Nelson
reviewed by James
2009-08-24Make setStartupState() fling events on "StartupState" LLEventPumpNat Goodspeed
2009-08-24merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3Richard Nelson
DEV-11254 DEV-11254 DEV-2003: DEV-21567 DEV-37301 EXT-104 EXT-138 EXT-217 EXT-256 EXT-259 EXT-259 EXT-328 EXT-348 EXT-386 EXT-399 EXT-403 EXT-460 EXT-492 EXT-492 EXT-531 EXT-537 EXT-684 improved text editor (handles multiple fonts simultaneously as well as inline widgets)
2009-08-24Some linux updater warning fixes for fussy futuristic gcc versions!Adam Moss
2009-08-21svn merge -r130238:130240 ↵Adam Moss
svn+ssh://svn.lindenlab.com/svn/linden/branches/linux-updater-6 QAR-1771 Linux Viewer Autoupdater + XUI-parse refactoring
2009-08-20Applied path from "[sldev-commits] r2604 - ↵Christian Goetze
projects/2009/snowglobe/trunk/indra/newview"
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-21 18:59:56 +0000