summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2009-09-04svn merge -r 129999:132607 ↵Don Kjer
svn+ssh://svn/svn/linden/branches/server/server-1.30 into trunk QAR-1863: Merge 525 changes from 1.27 -> 1.30 -> trunk 1.27 Changes: * QAR-1721: Vivox Recurring Billing (ViRB) * QAR-1743: 525 AO Classifieds * DEV-37701: Fix cleanup_indra nightly script so that it doesn't fail, and so that we know if it does * DEV-37926 - Fairmarket key roll 8/12/2009 * QAR-1744: 525 Landstore * QAR-1797: disable web services for find_people * QAR-1758: OpenID and Backup/recovery. * QAR-1794: ViRB proc fix - proc/recurring_billing/GetLocaleCountryByPackageId.php * Changing parameter name so the module signal could be used properly in the function below * QAR-1808 : Self-Reported First Name and Self-Reported Last Name have duplicate entries in the registration table * DEV-30204 : Moved the registration table from sequence to indra_aux. * removed dungeon from banned keyword list * DEV-30204 : Moved the registration table from sequence to indra_aux. Reviewed by kelly, cg, jarv * Merging new streambase dwell nightly to server-1.27 * Add update_parcel_dwell.py to serial_maintenance rule in the nightly.make Makefile, removing the dwell rule, since we don't want it running in parallel with other expensive nightly scripts. 1.30 Changes: * DEV-27476: version-manager only works in Firefox * DEV-27472: version-manager appears to load javascript from third party site. * mulib r92 that supports If-Modified-Since header and prevents arbitrary filesystem access through host:12107/manager/mochi/.. * Trivial conductor change that prevents a traceback when no regions are available to start. * Fixing "Out of Connections" error when running tests via SCUT * DEV-37554 - farm_deploy should get its ssh timeout from farm.ini * undo two lines of debugging changes that accidentally were checked in to farm * Adding MochiKit to MANIFEST for version-manager. * revised files for new parcel dwell process * Changing vault from an 'http' svn extern to a 'svn+ssh' svn extern. * DEV-38504 RPS map item queries are too verbose * added --skip-grid-mode-prompt to main in farm * DEV-38607: Region Presence Service includes disabled regions in estate responses, resulting in high slave query rate. * DEV-34781 - enable use_space_server_for_map_items and set map_item_request throttle settings in simulator.xml * DEV-38351 changes to ip_blacklist.xml file never get automatically picked up by the simulator * DEV-35443 Region border crossing issues. * DEV-35443 revert overzealous validity checking on neighbor messages. * DEV-15998 changing settings to re-enable teleport throttle, following DEV-37200 fix * QAR-1822 CPU Overrides update to indra.xml * DEV-15998 changing settings to re-enable teleport throttle, following DEV-37200 fix * DEV-34026 Update LLAgentInfo::forwardViewerStats() to make all viewer statistics * DEV-38906 Teleport throttle blocks prematurely when agent teleports back and forth between 2 regions * DEV-38861 Intra-region TP is blocked by inter-region TP throttl * DEV-38504 RPS map item queries are too verbose * initial import of deploy_to_dev_grid.sh
2009-09-04DEV-39441 - Eliminate boost:regexp from LLString::formatSteven Bennetts
Also removed a missing setting (merge bug)
2009-09-03DEV-39252 add 3 missing name= elements in the EN xui. This breaks localization.Ramzi Ramey
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-03build issue - const invariance in llplugintest/llmediaplugintestBrian McGroarty
2009-09-03DEV-31909 Revise strings.xml used in LSL editor hovertipsRamzi Ramey
We are not going to use \n in the XML to refer to a newline in the official viewer. I changed these to a real CRLF.
2009-09-02DEV-39355 Remove ctrl-alt-V shortcut for View Admin OptionsBrian McGroarty
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-02DEV-38453 (part 1)Ramzi Ramey
- need to refer to the correct button in the help text for new Pref > Graphics layout - need to rename nodes in Pref > General that have the OPPOSITE meaning as viewer 1.23; we intentionally want to disconnect these from their prior, opposite translation
2009-09-02Update XUI for Me Pick Info and Me Edit Edit Pick Info panels in sidetray to ↵Kurt Stauffacher
match updated style guide. EXT-805
2009-09-02merge ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1516 https://svn.aws.productengine.com/secondlife/pe/stable-2@1526 -> viewer-2.0.0-3 * Bugs: EXT-622 EXT-702 EXT-626 EXT-638 EXT-600 EXT-543 EXT-656 EXT-801 * New Dev: EXT-282 EXT-782 EXT-694 EXT-797 EXT-798 EXT-799 EXT-453
2009-09-02Made floater_media_browser.xml a single instance.Steven Bennetts
2009-09-01Fix up some more post-merge breakage.brad kittenbrink
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-01DEV-39252 fix duplicate name= elements in the EN xui. This breaks ↵Ramzi Ramey
localization, please dont do it.
2009-09-01Patch in some other useful scripts from trunk.Bryan O'Sullivan
2009-09-01Add hg metadata filesBryan 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-31Fix up some post-merge breakage.Bryan O'Sullivan
2009-08-31Merge with trunkBryan O'Sullivan
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
2009-08-31Standardized layouts, changed commitment model labels to ok/cancel, ↵Erica Olsen
modernized advanced floaters.