Skip to content
Snippets Groups Projects
  1. Nov 10, 2015
  2. Oct 17, 2014
  3. Aug 09, 2013
  4. Mar 29, 2013
  5. Oct 13, 2010
  6. Sep 21, 2010
  7. Aug 13, 2010
  8. Jan 07, 2009
  9. Jun 06, 2008
    • Josh Bell's avatar
      svn merge -r 88872:89137 svn+ssh://svn.lindenlab.com/svn/linden/qa/qar-652 --> release · 810a0b3d
      Josh Bell authored
      Effectively:
      svn merge -r 87048:88773 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-22-Server
      * Plus some gcc4.x fixes
      
      In detail:
      
      * Bump version numbers to 1.22.0 Server
      * Updated files for enabled conductor.
      * Added tarball pulling during deploy for central servers.
      * DEV-15160 Logins not remembering start location on beta grid
      * DEV-15167 Random failure with set-classified-stats
      * DEV-15193 Viewer Passing Through Unsanitized Strings to DB when creating classifieds.
      * Add --location to the curl invocation in fetch_agni_ws_snapshot
      * QAR-609 Some Havok4 bug fixes
      * QAR-460 Automatic XUI selection & Kick-ass Linux Fonts MergeMe
      * DEV-14704 1.21.1.86182 revealing hidden groups in profile
      * DEV-14641 Change automated Subject Line messages for IM-to-Email to avoid SPAM association
      * DEV-15387 Write unit test for LLStringFn::strip_invalid_xml().
      * Changed getpass.getuser() to os.getuid() as getuser() was returning the saved-UID of the process (root user, which kic
      ks off parabuild as parabuild u
      ser). We want os.getuid() as it correctly returns the parabuild user's uid. / Stupid mistake using os.getuid().. .fixed
      by using the pwd module to return the unix username given the userid from os.getuid()
      * QAR-623 More single ref attachment awesomeness testing
      * Committed temporary fix for running dwell and query-cache on deneb.lindenlab.com, since it's in the DFW colo with the
      current asset cluster.
      * DEV-15783 Groups not shown in search wont appear in your profile while using webservice
      * QAR-642 Even more single ref attachment awesomeness testing
      
      From Branch_1-21-Server (which didn't go directly into release)
      * addinng the phputf8 library found from http://phputf8.sourceforge.net/ and liscensed LGPL. For DEV-15202
      * Checking in a fix for settle balance portion proc - the event query was moved.
      * fix for DEV-15202 - replace non-utf8 with REPLACEMENT CHAR. See jira for more info.
      * Checking return value from /proc/vault/charge, must get back a string.
      * removed code used for the browser hud AB test.
      * Changed TTL from stupid default of 1234 to 5
      * DEV-15788  Fixing crashloganalyzer.py cleanup of unparseable crash reports.
      * DEV-15737  offline scripted IMs not working inprocess_im_using_ws
      
      Merge conflict resolutions/fixes include:
      * Addition of indra/test/llstring_tut.cpp to indra/test/test.vcproj migrated to CMakeLists.txt
      * Changes to BuildParams, scripts/automated_build_scripts/* reviewed w/ cg
      * Changes to deploy scripts (scripts/farm, install_indra.py, farm_deploy) based on the 1.22 changes except for mkpersist
      dir addition (retained from release)
      * Changes to scripts/crash_report/crashloganalyzer.py retained from 1.22, per Mani
      * scripts/generate_indra_xml.py, etc/services-station.dtd, indra/newsim/llagentinfo.cpp analyzed carefully by josh
      * indra/llcommon/llstring.h required fix for client build ("" --> std::basic_string<T>()) in LLStringBase<T> initializer
      * indra/llphysics/abstract/llphysicsshape.h #include syntax changed from <llmath/llvolume.h> to "llvolume.h"
      
      Psst, don't tell anyone, but the dataserver-is-deprecated
      810a0b3d
  10. Apr 03, 2008
  11. Oct 04, 2007
  12. Jun 13, 2007
  13. Mar 30, 2007
  14. Jan 02, 2007
Loading