summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2009-05-29Merge with SVN trunkBryan O'Sullivan
2009-05-22svn merge -r121194:121210Adam Moss
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.onetwo-merge-1 QAR-1531 viewer 1.23rc1+1.23rc2 merge to trunk
2009-05-21Merge with SVN trunkBryan O'Sullivan
2009-05-21Put the os.environ["DISTCC"] = ... call into main()Christian Goetze
2009-05-21Fix develop.py putenv bug, use new etch build-linux hosts for parabuild.Christian Goetze
2009-05-20Merge with SVN trunkBryan O'Sullivan
2009-05-20Windows: make dbghelp.dll an installable packageBryan O'Sullivan
Reviewed by Mani.
2009-05-19Fix to develop.py to build on 64 bit windows.Mark Palange
Added March 2009 DirectX SDK to cmake config. Reviewed by brad
2009-05-19Merge with SVN trunkBryan O'Sullivan
2009-05-19Now that 1.27 has branched away, bumping the version number to 1.29 toRobert Knop
mean "the development version between release versions 1.27 and 1.30".
2009-05-19svn merge -r118673:120720 ↵Robert Knop
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26 Merging server-1.26 back to trunk. Two conflicts -- llversionserver.hh (kept the trunk version) and in llsimparcelmgr.cpp -- also kept the trunk version. There was some code in 1.26 that included error printing from RDW that says "we should really not be hitting this code", and that code was gone in trunk... so, went ahead and kept the trunk part of that one conflict in that file.
2009-05-19Adding back the setting of "DEBUG", the lack of which caused many unitRobert Knop
tests to fail.
2009-05-18Result of svn merge -r119432:120464 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/http_database/merge-03 into trunk. QAR-1462
2009-05-14Set DISTCC_DIR to a location inside the source tree to avoid causing NFS ↵Christian Goetze
trouble with the default setting.
2009-05-14Max out distcc jobs to 12 in develop.pyChristian Goetze
2009-05-14There are 71 eniacs, not just 64Christian Goetze
2009-05-14Make develop.py work on eniacs the same way it works on stationsChristian Goetze
2009-05-11Another line ending changeBryan O'Sullivan
2009-05-11Merge with SVN trunkBryan O'Sullivan
2009-05-11Switch the XML file line endings to native.Bryan O'Sullivan
2009-05-06Merge with SVN trunkBryan O'Sullivan
2009-05-04QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3Adam Moss
svn merge -r118927:118939 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.0-merge-2-combo-QAR-1476 this is a composite of... svn merge -r115088:118182 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-23 conflicts resolved: C doc/contributions.txt C indra/llaudio/audioengine.cpp C indra/newview/CMakeLists.txt C indra/newview/llfloaterlandholdings.cpp C indra/newview/llpaneldirbrowser.cpp C indra/newview/llpanelgrouplandmoney.cpp C indra/newview/llpreviewscript.cpp C indra/newview/llviewermenu.cpp C indra/newview/skins/default/xui/en-us/notifications.xml and... svn merge -r116937:118673 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26 minor-to-trivial conflicts resolved: C indra/llcommon/llversionserver.h C indra/newsim/llrezdata.cpp C indra/newsim/llstate.cpp C indra/upgrade/schema_version/sequence/3/index_log_paypal.sql
2009-04-30svn merge -r118008:118374 ↵Christian Goetze
svn+ssh://svn.lindenlab.com/svn/linden/branches/cg/viewer-etch-1 QAR-1459 etch builds enabled
2009-04-28Merge with SVN trunkBryan O'Sullivan
2009-04-21svn merge -r117696:117697 ↵Kelly Washington
svn+ssh://svn.lindenlab.com/svn/linden/branches/fix-lslrpc/fix-lslrpc-merge to svn+ssh://svn.lindenlab.com/svn/linden/trunk
2009-04-21Merge with SVN trunkBryan O'Sullivan
2009-04-20Retry. Build system fixes for library-library dependencies, ported from ↵James Cook
skinning-7. OK by CG. svn merge -r117623:117624 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-7
2009-04-17Back out last commit, because it breaks mapserver build on linux, dammit.James Cook
2009-04-17Build system fixes for library-library dependencies, ported from skinning-7. ↵James Cook
OK by CG. svn merge -r117623:117624 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-7
2009-04-16svn merge -r117314:117337Adam Moss
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1 QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge
2009-04-15Turn the artwork tree back into a downloaded package, but revision-controlBryan O'Sullivan
the XML files.
2009-04-14Missed a file.Bryan O'Sullivan
2009-04-14Missed a file.Bryan O'Sullivan
2009-04-14Re-add character data.Bryan O'Sullivan
2009-04-14Re-add character data.Bryan O'Sullivan
2009-04-13merge -r116796:116932 ↵Christian Goetze
svn+ssh://svn.lindenlab.com/svn/linden/branches/http-texture/http-texture-10 DEV-8668 (llkdu) DEV-30348 (set development default channel to LindenDeveloper)
2009-04-10Working around DEV-30401 by yanking the etch 32bit build code until the ↵Christian Goetze
viewer also builds on etch
2009-04-09This is causing open source build problems - cherrypicked DEV-29644 ↵Brian McGroarty
VWR-12587: Cmake install target has a hard coded secondlife-bin reference remaining
2009-04-09Get 32-bit builds going on 64-bit Debian Etch.Bryan O'Sullivan
Reviewed by Brad.
2009-04-09svn merge -r115000:116937 ↵Robert Knop
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26 Merging from server-1.26 to trunk Only a few conflicts: scripts/farm_distribute : the upload rate in trunk was even more conservative than the one I switched to in 1.26, so kept the trunk version. indra/llcommon/llversionserver.h : did svn revert to keep trunk indra/newsim/lltask.cpp : svn is weird. The merge conflict was one that it's not obvious why it was there. However, Simon and I looked at it, and the solution was obvious : keep the trunk blob where the conflict was flagged. indra/lib/python : conflict was differing versions of the eventlib extern. did svn revert . to keep trunk.
2009-04-08svn merge -r116334:116916 ↵Ryan Williams
svn+ssh://svn.lindenlab.com/svn/linden/branches/rad-chilies/rad-chilies-trunkmerge-2
2009-04-07We must #include <cstring> for memcmp to be found reliably.Bryan O'Sullivan
2009-04-01QAR-1284 ip-takedown tools simulator work is ready for mergeAndrew Meadows
svn merge -r115879:116020 svn+ssh://svn.lindenlab.com/svn/linden/branches/dmcat/dmcat-5 no conflicts
2009-03-31Move some viewer artwork into a downloadable package.Bryan O'Sullivan
These files haven't been touched in years. Reviewed by Richard.
2009-03-27Removed a newline in string definition - cmake does not support multiline ↵Christian Goetze
strings
2009-03-27Result of svn merge -r115238:115240 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/trivial-changes/trivial_slave_merge into trunk. In turn a result of svn merge -r113279:113280 svn+ssh://svn/svn/linden/branches/trivial-changes/trivial-changes-1 into trivial_slave_merge and svn merge -r107805:110030 svn+ssh://svn/svn/user/phoenix/slave-ds into trivial_slave_merge. QAR-1329
2009-03-27Drop an unnecessary sed from linden.mass.Bryan O'Sullivan
2009-03-26Use a glob pattern to determine which XUI files to present in IDEs.Bryan O'Sullivan
This is much less painful than maintaining that list by hand, since we don't use those files for actual builds.
2009-03-24Changed LL_VERSION_MINOR to equal 24Debi King
2009-03-20svn merge -r113004:115000 ↵Dave Simmons
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26 Merge latest 1.26 into trunk
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 14:51:54 +0000