summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2008-07-22QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> ReleaseSteven Bennetts
merge Branch_1-20-14-Viewer-merge -> release Includes Branch_1-20-Viewer-2 through 92456
2008-07-18merge support-featurettes-snapshot-merge-2 for QAR-754, includes:James Cook
* featurettes-4 89061:89589 (which is all of featurettes-1, -2, and -3, and part of -4) * gteam-showstoppers-3 91950:91951 (which is all of gteam-showstoppers-1, -2, and -3) * featurettes-5 92149:92150 (patch for last line of chat text not visible in chat history, DEV-17771) * snapshot-3 91988:91991 (which is all of snapshot-1, -2, and -3) Merging revisions 92190-92387 of svn+ssh://svn.lindenlab.com/svn/linden/branches/support-featurettes-snapshot-merge-2 into release, respecting ancestry * QAR-590 Merge Lock Request for Support Sprint * QAR-627 Merge snapshot improvements * QAR-686 Merge Lock request for Featurettes
2008-07-17svn merge -r 91176:92383 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-23-Server Backport fixes from the 1.23 Server branch * DEV-17223 remove the words slot and bets from dataserver.xml * DEV-17351 Unable to set estate manager * DEV-17138 users with god mode capabilities not able to join groups * DEV-17785 SVC-2633: Floating Text which was set before Server Update 1.23 does not do linebreaks anymore but one line instead * DEV-17863 Memory Leak in 1.23 (related to returning objects?) * DEV-17804 CSR tool showing old data on Summary page * DEV-17811 Ban list showing (???) (???) for names dataserver-is-deprecated
2008-07-15Add code to support add_viewer_version_to_managerChristian Goetze
2008-07-15svn merge -r 90938:92097 ↵Jon Wolk
svn+ssh://svn.lindenlab.com/svn/linden/branches/qar-730/qar-730-merge -> release. This is for QAR-730: Combination merge of QAR-432 and QAR-601
2008-07-10QAR-622 merge -r91846:91877 svn+ssh://svn/svn/linden/branches/scut-newstyle-5Christian Goetze
2008-07-10Added -N | --no-distcc option to develop.py to prevent use of distcc in the ↵Kyle McKay
generated makefiles
2008-07-10Check the actual version of the compiler we're going to use to compile the ↵Kyle McKay
sources to determine which options need to be added rather than the version of some other compiler on the system.
2008-07-09Some .glsl files were propset svn:executableBrian McGroarty
2008-07-07Add support for GRID:STRING in cmakeChristian Goetze
2008-07-03simple crash fix if someone creates a bad command line. fallout from string ↵Aaron Brashears
cleanup. very small. revert if there are problems.
2008-07-03Including fontconfig in the viewer build. (Omitted before)Jennifer Leech
Fix for DEV-17484: package-grabber omits fontconfig
2008-07-03DEV-17460 updated the cmake SERVER variable init to work reliablyMark Palange
2008-07-03Fix for windows + develop.py: Use pscp on windows instead of scp.Jennifer Leech
This also requires a putty session to be created, same as we do for svn.
2008-07-02Removing status msg: "Could not find scp or pscp executable" for case when ↵Jennifer Leech
scp not on system. Clutters output, and is not really necessary.
2008-07-01Bad license header on llrendersphere.cpp, files missing from export manifestBrian McGroarty
2008-06-30Merging in file-move-merge ( QAR-649 )Eric Tulla
Result of "svn merge -r 90669:90786 $tulla/file-move-merge ." Be careful of future merges involving changes to any of these moved files as SVN usually does the wrong thing: newview/llglslshader.* -> llrender/llglslshader.*, llrender/llshadermgr.*, newview/llviewershadermgr.* (gets split into 3 separate files) newview/llpostprocess.* -> llrender/llpostprocess.* newview/llrendersphere.* -> llrender/llrendersphere.* newview/llcubemap.* -> llrender/llcubemap.* llwindow/llgl.* -> llrender/llgl.* llwindow/llglstates.h -> llrender/llglstates.h llwindow/llgltypes.h -> llrender/llgltypes.h llwindow/llglheaders.h -> llrender/llglheaders.h
2008-06-28svn merge -c 90839 ↵Christian Goetze
svn+ssh://svn.lindenlab.com/svn/linden/branches/tulla/file-move-merge
2008-06-27QAR-669 1.20 Viewer RC11Steven Bennetts
QAR-648 1.20 Viewer RC10 merge Branch_1-20-Viewer-2 -r 88724:90511 -> release
2008-06-27vivox is cleared for open source distributionJennifer Leech
removing conditional install reviewed by cg
2008-06-26svn merge -r89701:90677 ↵Jennifer Leech
svn+ssh://svn/svn/linden/branches/install-dev-binaries/s3-build -> release
2008-06-26Bumping up version in anticipation of freezing for the next server release.Josh Bell
2008-06-26QAR-628 merge string-cleanup-5 -r 90476:90508 -> releaseSteven Bennetts
dataserver-is-deprecated
2008-06-25DEV-16502 - Cleaned up error messages, better error handling in vstool/main.csMark Palange
Reviewed by Richard
2008-06-25svn merge -r90394:90492 svn/branches/havok4/qar-689 --> releaseDave Simmons
QAR-689 - branch/havok4/havok4-7 r89805 is ready for merge back into release
2008-06-24DEV-16958 - added precompiled header support to windows simulator and viewer ↵Mark Palange
projects. Reviewed by Richard
2008-06-24Update to remove the warnings about WindowsDevLibsCopy.cmake from previous ↵Mark Palange
commit (DEV-16646)
2008-06-24DEV-16646 second-life post build silently fails. Instead of post build, ↵Mark Palange
there's a new target - copy-win-libs. Removed python dependecy from the copy Reviewed by bos
2008-06-23adding the fabled "server" and "viewer" targets everyone has been wishing ↵Paul Oppenheim
for. Reviewed by cg. not for a jira.
2008-06-21svn merge -r90150:90340 ↵Kyle Ambroff
svn+ssh://svn.lindenlab.com/svn/linden/branches/qar-699_combo-merge --> release QAR-699 - Combo merge for QAR-687, QAR-637, QAR-586 * QAR-687 - Test build with libs on S3 * QAR-637 Test dynamic sound throttle * QAR-586 Test new http features branch
2008-06-19Fixes issue with non-null terminated stringSam Kolb
Reviewed by Steve
2008-06-19svn merge -r 89027:90119 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-22-2-Server --> release Backport server patches from 1.22 Server production branch to the trunk. * DEV-16189 Search: Private Estate on Teen Grid Visibility issue. ** svn merge -r88933:89027 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-22-Server * QAR-651 / DEV-14894: Convert relevant webservices to use the on/in syntax to prevent them from needlessly hitting mysql.agni ** svn merge -r89027:89030 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-22-Server * Adding back the type_mask checking which was causing extra terms to be blacklisted. ** svn merge -r89030:89032 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-22-Server * Under GCC, argument names must match between declaration and definition * Incorrect rename * Cherry pick fix for DEV-16131, already pushed live to agni ** svn merge -c 89174 svn+ssh://svn.lindenlab.com/svn/linden/release * QAR-664 Resolve start-location Errors on Login ** svn merge -r 88842:89176 svn+ssh://svn.lindenlab.com/svn/linden/branches/user_start_location_missing_fix * QAR-668 / SEC-53: Script that crashes regions (Round 2) ** svn merge -r 89206:89210 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-22-2-Server_DEV-12357 * QAR-579 / SEC-77 - prevent sim crash caused by libsl proxy packet injection ** svn merge -r 87143:87226 svn+ssh://svn.lindenlab.com/svn/linden/branches/sec-77-crash * DEV-16297 Error Message Can't rez object because you are not allowed on the parcel on some group owned parcels ; Group permissions & rezzing on group land changed in 1.22.2 * DEV-16189 - New query to get a region's parent estate, so we can hide main grid regions from teen users (and vice versa) in All search. * svn merge -r 89494:89593 svn+ssh://svn.lindenlab.com/svn/linden/branches/safe-locations/kill-table-scan --> Branch_1-22-2-Server * simulator.xml file that has improved-im and send-mail enabled. * DEV-16477 and DEV-16380 - fixes to prevent ever expanding db table and writing LLMETRICS to syslog for streambase. * Fixed a teeny bug that caused sorting to be messed and broke DEV-16745. * Adding geolocation IsPass proc to Branch-1-22-2. It is needed to login.cgi work that can only be done against agni at the moment * QAR-693 svn merge -r89984:89986 svn+ssh://svn/svn/linden/branches/security/rez-attach_sec-95 into Branch_1-22-Server. * QAR-619 svn merge -r87886:87945 svn+ssh://svn.lindenlab.com/svn/linden/branches/security/sim-crash-sec-83 into Branch_1-22-Server * Permanently enabling procs as part of DEV-14770 - Enable script-data-requests * Changed TTL to 300 seconds (5 mins) to match lldatabaseconnector's time out value * Permanently enabled parcel-info. Deployed to grid: June 18, 2008. Tracking Jira DEV-14135 * Updated named query TTL to 3600. Used to be 0
2008-06-18Squeezing fix for DEV-16861: Tracebacks in backbone(multiagentchat) into ↵Jon Wolk
release. 2 line change. Approved by josh
2008-06-17whoops - one line, nay, one *word* fix to my mac universal patch. Reviewed by cgPaul Oppenheim
2008-06-16for "new lib install step is too slow!" problem mailed to cmake@. Reviewed ↵Paul Oppenheim
by bos and cg.
2008-06-16"mac cmake build should not be universal by default" changes. Reviewed by bos.Paul Oppenheim
2008-06-13Fixes the the copy-win-scripts related cmake files to make the ↵Mark Palange
copy_win_scripts target function properly.
2008-06-12comment out the "simple" cases - it is never as simple as that.Christian Goetze
2008-06-12svn merge -r89258:89534 ↵Jennifer Leech
svn+ssh://svn/svn/linden/branches/install-dev-binaries/idb2-merge-buildme
2008-06-11Added another search path for the DirectX SDK (the August 2007 version). At ↵James Cook
some point we should decide exactly what DirectX SDK versions we support, but today is not that day. And this is not the oldest version on the path list.
2008-06-11svn merge -r89446:89445 indra/newview/viewer_manifest.pyBryan O'Sullivan
2008-06-10Make Mac viewer build happierBryan O'Sullivan
2008-06-10Tiny indentation fixBryan O'Sullivan
2008-06-07svn merge -r 88991:89027 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-22-2-Server --> release Due to the gnarly history of the source branch and merge history of release, combine with cmake header and gcc-fu, this was an "interesting" merge.
2008-06-06svn merge -r 88872:89137 svn+ssh://svn.lindenlab.com/svn/linden/qa/qar-652 ↵Josh Bell
--> release 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
2008-06-06QAR-650 - Viewer RC 9 merge -> release (post cmake)Steven Bennetts
merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release
2008-06-06Changed the cygwin to windows path conversion to use 'cygpath -w'Mark Palange
2008-06-06make it work on cygwin again. also fixed a bad parameter.Aaron Brashears
2008-06-06DEV-16277 superfluous "Price" text appears in Edit toolsSteven Bennetts
Note: trivial change.
2008-06-06DEV-16285 - Give vstool.exe better error reporting output.Mark Palange
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 22:44:38 +0000