summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2009-01-08Result of svn merge -r107256:107258 ↵Aaron Brashears
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2009-01-06QAR-1141 svn merge -r107086:107087 ↵Christian Goetze
svn+ssh://svn.lindenlab.com/svn/user/cg/llvfs-fix-2
2009-01-06Fix for etch build. Q and I both fixed LLDate by adding an operator!=() but ↵Andrew Meadows
we did it different ways so the two changes didn't cause a commit collision. I'm removing mine in favor of Q's.
2009-01-05svn merge -r106715:HEAD ↵Kent Quirk
svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk.
2008-12-31Missed contributor for VWR-8430, DEV-18635. Putting directly in trunk as ↵Bradley Payne
this has already been merged from featurettes. Change OKed with Q (the current lockholder) prospero, and robla.
2008-12-29make it easer for developers to examine list output by sorting the results ↵Aaron Brashears
prior to display. DEV-25457
2008-12-23QAR-1142 merging 1.22 RC0-RC4 changes.Mark Palange
svn merge -c 106471 svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_1-22-106055_merge
2008-12-22Revert one openal -> openal-soft replacement - reviewed by MossChristian Goetze
2008-12-21Carry through andrew's rename of openal to openal-soft into cmake, see if ↵Christian Goetze
that helps
2008-12-19Changed 'openal' to 'openal-soft' to be more correct.Andrew Meadows
Added a linux64 version of openal-soft for the etch build. Not reviewed.
2008-12-19Fixing tut related compile errors on etch:Andrew Meadows
(1) the LLLand class had to be forward declared in a cpp file that did not include llland.h (2) ensure_equals(const char*, type, type) requires that type have an operator!=(type, type) defined. (3) ensure_equals(const char*, type, type) is so overloaded that the compiler can have trouble picking the right version when it has to implicitly cast a std::string to "const char*" AND multiple valid casts exist for type --> S32, F32, etc. To solve this problem we must explicitly pass in a "const char*" instead of a std::string. Reviewed with CG
2008-12-18Added Cmake test macrosDave Hiller
Changed simulator cmake to use the new macros
2008-12-18Result of svn merge -r105061:106057 ↵Aaron Brashears
svn+ssh://svn/svn/user/phoenix/upgrade-tut into trunk. QAR-1074
2008-12-18QAR-1075 svn merge -r106114:106224 ↵Christian Goetze
svn+ssh://svn.lindenlab.com/svn/linden/branches/parcel-stats-merge
2008-12-16EGADS - last checkin to wrong branch. undone.Karl Steifvater
2008-12-16fix for coordinates, convertCoords() only works when in fullscreen window.Karl Steifvater
2008-12-16clean up contributions.txt - seriouslyBrian McGroarty
2008-12-16VWR-1813 was credited to the wrong contributorBrian McGroarty
2008-12-15svn merge -r105329:105903 ↵Melinda Green
svn+ssh://svn/svn/linden/branches/featurettes/featurettes-batch4-merge Resolving QAR-1051 Merge featurettes batch #4
2008-12-10always skip fmod shutdown, instead of just for release builds.Adam Moss
fmod shutdown has been a source of mystery crashes forEVER (go mine svn!). I don't know why they'd be more aggressive now. butttt... materially different code behaviour depending on build type sucks as a policy anyway, so always skip fmod shutdown. straight-to-trunk to unblock(?) featurettes landing.
2008-12-09svn merge -r104949:105037 ↵Ryan Williams
svn+ssh://svn.lindenlab.com/svn/linden/branches/rad-chilies/rad-chilies-06-release-merge QAR-1048: Distributed L$ Transactions > Rad Chilies 06 Indra items
2008-12-09Missing contributions.txt creditsBrian McGroarty
2008-12-05Don't link the simulator with iconv.dll on Windows.Kyle Ambroff
2008-12-05merge -r104755:104769 /linden/branches/deploy-refactor-6 --> trunkDave Kaprielian
2008-12-05indra/cmake/APR.cmake: Fix windows simulator build so it still dymanically ↵Kyle Ambroff
links with iconv.
2008-12-04Merging from server/server-1.25 back to trunk.Robert Knop
svn merge -r99446:104838 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.25 Conflicts resolved by Prospero, except for one scary conflict in SendConfirmationEmail.php which was resolved by jarv.
2008-12-02QAR-1040 maint-viewer-11 + OpenAL combo mergemeAdam Moss
svn merge -c104451 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/openal-maint-viewer-11-combo-r104448
2008-12-01svn merge -r103586:104391 ↵Andrew Meadows
svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/maint-server-4-sandbox-r103546 Picking up the following bug fixes: DEV-19747 Flooding sim with bogus animation packets crashes sim DEV-20978 Investigate baked avatar texture caching in simulator - ids not properly stored DEV-5316 llsd-get .../runtime/top and "World:Region/Estate:Debug:Get Top Scripts" broken DEV-18807 SVC-2596: Script dataserver events become permanently blocked until sim restart DEV-19108 SVC-2616: Torus refuses to accept 180 degree texture rotation DEV-9944 Simulator crash failing to write simstate to file .tmp.tmp DEV-21439 Configure VFS file size via simulator.xml
2008-11-26Updating version to 1.25.0. Current in 1.25 branch is 1.25.2, but thereRobert Knop
are changes in that branch that haven't been merged down into release yet. It makes more sense for things branched from release to be called 1.25 rather than 1.24 now....
2008-11-21Merging the changes in viewer_1-22-0 (1.22 RC0) back into trunk, revs. ↵Mark Palange
101837 to 103519
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 ↵James Cook
-r102882:102883 svn+ssh://svn.lindenlab.com/svn/linden/branches/windows-setup/windows-setup-3-merge
2008-11-18QAR-1022 svn merge -r101843:102448 ↵Christian Goetze
svn+ssh://svn.lindenlab.com/svn/linden/branches/opensource-drops/opensource-drops-4 -> release
2008-11-18QAR-963 svn merge -r101685:101752 ↵Christian Goetze
svn+ssh://svn.lindenlab.com/svn/linden/branches/rad-chilies/rc05-release-merge
2008-11-17trivial followup to QAR-1016 - remove a line of zealous debugging spew.Adam Moss
2008-11-12svn merge -c102054Adam Moss
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/morejoy-2-r102015 QAR-1016 joystick+spacenav improvements MERGE
2008-11-07QAR-992 Merging revisions 101012-101170,101686-101687 of ↵Mark Palange
svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into linden/release
2008-11-07Merged into release with command:Kartic Krishnamurthy
================================= svn merge -r100865:101402 svn+ssh://svn/svn/linden/branches/purge-dpo-code-for-merge . QAR-951 : Sandbox QA for DEV 20842 - Ensure DPO is not enabled accidentally QAR-967 : Merge Build for DEV 20842 - Ensure DPOis not enabled accidentally QA tested: Beast, Oskar DEV's fulfilled as part of this branch: ====================================== DEV-20842 Prevent accidental activation of DPO procs DEV-23028 Mac build fails - link error dual inclusion DEV-20824 VWR-9255: Build fails on mac_updater and mac_crash_logger targets due to info.plist problems DEV-22997 Xcode project: 'server' target has no dependencies DEV-23353 Friend request custom messages come through as an asset tag. DEV-23309 Voice Chat Indicator does not show active voice status DEV-23187 Can't teleport to home location
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
* Shifted common code for copy_bans.py and del_empty_estates.py into the indra library. * Documented copy_bans.py and del_empty_estates.py. * Added iter_chunks generator to a new module: indra.util.iterators. * Added unit tests for indra.util.iterators.
2008-11-03DEV-21940 - Add five new dev grids to the viewer login panel. bharati, ↵Kyle Ambroff
chandra, danu, parvati and skanda.
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
Reviewed by Mani.
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 ↵James Cook
version. OK by Ambroff.
2008-10-28svn merge -r100302:100467 installer-james-combo-merge for QAR-972, ↵James Cook
incorporating: QAR-892 Windows installer that pings secondlife.com on launch QAR-837 Six New Languages in the Installer QAR-908 downloader-support-1 merge
2008-10-28Allow use of Python 2.6, in case it's useful for OSS builds.Bryan O'Sullivan
2008-10-28someone added a directory to a file list in one of the prepacked libs. just ↵Aaron Brashears
ignore that use error on cleanup.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 20:50:19 +0000