Skip to content
Snippets Groups Projects
  • Don Kjer's avatar
    76d05a7e
    svn merge -r 129999:132607 svn+ssh://svn/svn/linden/branches/server/server-1.30 into trunk · 76d05a7e
    Don Kjer authored
    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
    76d05a7e
    History
    svn merge -r 129999:132607 svn+ssh://svn/svn/linden/branches/server/server-1.30 into trunk
    Don Kjer authored
    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
Code owners
Assign users and groups as approvers for specific file changes. Learn more.