summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Expand)Author
2008-12-04Merging from server/server-1.25 back to trunk.Robert Knop
2008-12-02QAR-1040 maint-viewer-11 + OpenAL combo mergemeAdam Moss
2008-12-01svn merge -r103586:104391 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-ser...Andrew Meadows
2008-11-26Updating version to 1.25.0. Current in 1.25 branch is 1.25.2, but thereRobert Knop
2008-11-21Merging the changes in viewer_1-22-0 (1.22 RC0) back into trunk, revs. 101837...Mark Palange
2008-11-20Add an "if (EXISTS ${VIEWER_PREFIX}win_setup)" to fix open source dropChristian Goetze
2008-11-19QAR-1018 Lightweight Windows Setup App (windows-setup-3). svn merge -r102882:...James Cook
2008-11-18QAR-1022 svn merge -r101843:102448 svn+ssh://svn.lindenlab.com/svn/linden/bra...Christian Goetze
2008-11-18QAR-963 svn merge -r101685:101752 svn+ssh://svn.lindenlab.com/svn/linden/bran...Christian Goetze
2008-11-17trivial followup to QAR-1016 - remove a line of zealous debugging spew.Adam Moss
2008-11-12svn merge -c102054Adam Moss
2008-11-07QAR-992 Merging revisions 101012-101170,101686-101687 of svn+ssh://svn.linden...Mark Palange
2008-11-07Merged into release with command:Kartic Krishnamurthy
2008-11-05Fix to cmake darwin package target needed for cmake 2.6.2Mark Palange
2008-11-04* Added del_empty_estates.py script.John Biesley
2008-11-03DEV-21940 - Add five new dev grids to the viewer login panel. bharati, chandr...Kyle Ambroff
2008-10-31Fix more silly printf crasher holesBryan O'Sullivan
2008-10-31Fix nasty printf argument errorBryan O'Sullivan
2008-10-31Fix heinous traceback if commands are not foundBryan O'Sullivan
2008-10-30Windows build: only run vstool.exe once per build type.Bryan O'Sullivan
2008-10-30When running vstool from develop.py, use the correct build type.Bryan O'Sullivan
2008-10-29Added search path for Microsoft DirectX SDK (August 2008), the latest version...James Cook
2008-10-28svn merge -r100302:100467 installer-james-combo-merge for QAR-972, incorporat...James Cook
2008-10-28Allow use of Python 2.6, in case it's useful for OSS builds.Bryan O'Sullivan
2008-10-28force dos drive letters to be uppercase. Patch from Alissa Sabre. vetted thro...Aaron Brashears
2008-10-23A bug in viewer_manifest.py was causing Linux packages to be builtKyle Ambroff
2008-10-20Merge 98702-99587 viewer_1-21 -> release Merging changes made between 1.21 RC...Mark Palange
2008-10-20bump build number to 100,000. w00t.Kyle Ambroff
2008-10-17DEV-22360 - Interim fix for VWR-9784: Unable to upload scripts - this will be...Brian McGroarty
2008-10-10DEV-22018 : cllsd unit test failures. Fixed mostly by changing the Python co...Ryan Williams
2008-10-10svn merge -r99056:99248 svn+ssh://svn.lindenlab.com/svn/linden/branches/andre...Andrew Meadows
2008-10-09QAR-907: svn merge -r 98908:98910 svn+ssh://svn/svn/linden/qa/sim-metrics/sim...Don Kjer
2008-10-08merge r97380-98701 branches/viewer/viewer_1-21 (Viewer RC5 and security fixes...Mark Palange
2008-10-07Roll back of r98854 Accidentally commited merge in progressMark Palange
2008-10-07merge r97380-98701 branches/viewer/viewer_1-21 (Viewer RC5 and security fixes...Mark Palange
2008-10-07QAR-829: svn merge -r98245:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branch...Kent Quirk
2008-10-07svn merge -r98039:98711 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branc...Kyle Ambroff
2008-10-01svn merge -r96886:98039 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branc...Christian Goetze
2008-09-29QAR-872 Viewer 1.21 RC 3Steven Bennetts
2008-09-29Result of svn merge -r97546:97641 svn+ssh://svn/svn/linden/branches/apache-ca...Aaron Brashears
2008-09-24DEV-19146 / Don't hard-code Windows paths.Bryan O'Sullivan
2008-09-23merge -r97452:97484 svn+ssh://svn.lindenlab.com/svn/linden/branches/deploy-re...Dave Kaprielian
2008-09-23Re-enable blowfish tests on Darwin.Bryan O'Sullivan
2008-09-23QAR-849 merge maint-viewer-10-merge 96838-97237 -> releaseSteven Bennetts
2008-09-17svn merge -r95195:96886 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branc...Kyle Ambroff
2008-09-16DEV-16938: use per-build-type build trees on LinuxBryan O'Sullivan
2008-09-16QAR-751 : Merge Agent Inventory Services - Fetch Inventory and Fetch Inventor...Kartic Krishnamurthy
2008-09-15Fix for VC7 DEBUG build failureSteven Bennetts
2008-09-15Revert r96619 for nowBryan O'Sullivan
2008-09-12DEV-18419 / Allow develop.py to be run from outside source treeBryan O'Sullivan