summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
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-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-10Merge changesNat Goodspeed
2009-09-10QAR-1619: move Linux SLPlugin executable to the viewer executable directoryNat Goodspeed
2009-09-09Merged parabuild work and trunk with nat's latest linux linkage and LSL ↵brad kittenbrink
tests fixes.
2009-09-08QAR-1619: reconcile Linux-specific logic in LLAppViewer::launchUpdater() ↵Nat Goodspeed
with Windows and Mac
2009-09-08merged cg's automated build script changes into login-apibrad kittenbrink
2009-09-08Merge Brad's r928694ee0b65 changesNat Goodspeed
2009-09-08QAR-1619: Finish replacing RunBuildTest.cmake with run_build_test.py.Nat Goodspeed
Because the details of RunBuildTest.cmake versus run_build_test.py had to be changed in so many different places, introduce LL_TEST_COMMAND CMake macro (in LLTestCommand.cmake) to encapsulate construction of the actual command line. Use LL_TEST_COMMAND in LL_ADD_PROJECT_UNIT_TESTS, LL_ADD_INTEGRATION_TEST, the big indra/test monolith and the various LslCompilerMacros. Fix run_build_test.py to pass through the test executable's own options (e.g. --touch, --output) without inspection. Defend it against the case when the platform-specific library path environment variable doesn't yet exist. Make it report errors only on nonzero test-program rc. Remove RunBuildTest.cmake.
2009-09-04Fix for SLPlugin.exe packaging failure. Still needs some cleanup though.brad kittenbrink
qtwebkit4.dll etc aren't being staged to the sharedlibs dir like everything else.
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-01Try double-quoting backslashesCG Linden
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-01Use rev numbers instead of changeset IDs for now.Bryan O'Sullivan
2009-09-01Patch in some other useful scripts from trunk.Bryan O'Sullivan
2009-09-01Merge with SVN viewer-2.0.0-3 branchBryan O'Sullivan
2009-09-01Trivial commit for hg import purposesBryan O'Sullivan
2009-09-01Sync up with a number of SVN changes that snuck in via weird mergesBryan O'Sullivan
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-01Also quite the backslashes in the argument for the sign commandCG Linden
2009-09-01DEV-34522: [COMMENTS ONLY] clean up comments about (formerly) disabled testsNat Goodspeed
2009-08-31Quote any backslashes so they get preserved when invoking python.CG Linden
2009-09-01Fix syntax error introduced by your's truely into develop.pyChristian Goetze
2009-08-31Fix syntax error in viewer_manifest.pyCG Linden
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-31Attempt to invoke the code signer differentlyCG Linden
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-31Port over the new build scripts from para-test, tweek update_version_files ↵CG Linden
to use the repo revision number for now.
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-22 22:25:11 +0000