summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2008-02-07svn merge -r 79445:79449 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenance-5-merge-79386 QAR-242 merge of maintenance-5 (QAR-203) * DEV-6548 Copy To Inventory fail to execute without any output feedback when Notecard has changes but not saved * DEV-7600 Deleting someone else's object in god mode crashes sim * DEV-5329 LLSD parsers should determine and set maximum parse sizes * DEV-7473 Resolve instant message crash report * DEV-2904 Presence Issues not (apparently) caused by scripted attachments * DEV-7083 Investigate Null Folder IDs Bug that caused 470K inventory items with Null Folder IDS on the Grid * DEV-2865 Textures/Snapshots in a notecard are opened again when you click copy to inventory. * DEV-6612 VWR-3290: Linux scons build script doesn't work with distcc * DEV-8002 c++ llsd notation parser accepts malformed data * DEV-8001 c++ xml parse returns wrong number of elements parsed * DEV-8089 Double delete in statc structured data parse functions * DEV-5326 Any viewer can request presence information for any agent * DEV-2378 python service builder does not sort query string * DEV-7872 Block teleport off teen grid sub-estates like Schome Park / Open University * DEV-4465 Add a "logfile" command line option to the sim to create log files
2008-02-05do not attempt to use secondlife.com in unit tests for now.Aaron Brashears
2008-02-05svn merge -r 78407:79136 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-0-Server --> release * Fix for login script "active gestures" query causing massive inv db load * DEV-9755 - calling llEscapeURL with an empty string crashes the simulator * DEV-7007 - Block users who are limited to a subestate from connecting to any other subestate on login. * Revert maintenance-4/indra/dataserver/lldatainventory.cpp r74862 due to bad query performance * Make llEscape() behavior match previous behavior (and curl) * DEV-9871 - Record of land sale transaction in 1.19.0 regions failing to update in World/CSR NOTE: There are more changes after 79136 that need to get merged, but they haven't been through QA
2008-02-01merge Branch_1-19-0-Viewer -r 78432:78989 -> releaseSteven Bennetts
QA'd in QAR-186: DEV-9179: Commit translated and reviewed strings from 1.19 frozen branch pull DEV-8792 Place information teleport button hidden behind chat bar. DEV-9374: Remove "New Account..." and "Preferences" buttons from login screen for 1.19.0 DEV-9411 -- Update required version of Quicktime library to 7.4 for 1.19.0 Viewer DEV-9430 Viewer auth failed login screen is shown in the loginxui 1.19 viewer on failure to retrieve normal login screen - changed wording of error page DEV-8537 Chat console appearing underneath status buttons DEV-9283 Chatbar cant be open while in mouselook DEV-9226 Some Dazzle? icons have sneaked into the release branch DEV-9520 Menus and Other items minimise behind onscreen buttons DEV-9521 Unable to ctrl and click to select in the friends list DEV-9530 SEC-20 Exploit to force users to teleport to a location on profile open. DEV-6833 - Mature events icon and checkbox is missing from map legend Also: Added vc9 project files (+ minor changes for vc9) (steve) Modified vc project files to not include the path for flex / bison (steve) Added marker file deletion to crash logger to stop double reporting. (cube)
2008-02-01EFFECTIVE MERGE: maint-viewer-3 -r 77368:77381 -> releaseSteven Bennetts
ACTUAL MERGE: merge maint-viewer-3-merge -r 79051 -> release
2008-01-28svn merge -r 78408:78432 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-0-Viewer Port these changes which have passed QA in QAR-186: * Bumping version numbers to 1.19.0 * DEV-8872 Text in group list in profile and group notices is difficult to read * DEV-9290 Clicking on Chat button in toolbar does not toggle chat bar * DEV-4721 Upload symbol map files to S3
2008-01-28svn merge -r77355:77661 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Viewer Pick up one last change from a deprecated viewer branch.
2008-01-24svn merge -r 78173:78397 search-milestone2-1 for classified click-through ↵James Cook
logging for Streambase so data warehousing can figure out ROI/purchase history immediately after a teleport from an ad. DEV-9204
2008-01-24svn merge -r 77416:78126 ↵Jon Wolk
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-0-Viewer_abandoned -> release
2008-01-24svn merge -r 77415:77842 ↵Jon Wolk
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-0-Server_abandoned -> release. Per josh\'s request, this got merged directly to release, did not go through normal lock phase. Made one minor change in the merge to avoid some silliness with the conflicts.
2008-01-24DEV-9328 DEV-9330 DEV-9334 Fixed license information in source files to ↵James Cook
match the wiki [[License Substition]] standard. Commit to release OK by Josh/Jwolk.
2008-01-23DEV-8923: info window does not pop up when transitioning from a Havok1 to ↵Leyla Farazha
Havok4 region reviewed by tess
2008-01-19dev-8998 xuilogin shows grid dropdown by defaultLeyla Farazha
2008-01-18svn merge -r77476:77484 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/sculptcopy Shortcut for QAR-223 into release. Fix for DEV-8761/SEC-17 Ability to Access Sculpted Prim Textures from Database without owning actual sculpt texture, allowing for people to "steal" sculpts.
2008-01-18svn merge -r 77823:77835 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/loginxui-for-merge QAR-222
2008-01-17QAR-211: Logical merge of:Josh Bell
svn merge -r 76578:76594 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/linuxbhear-based-on-release-r76573 svn merge -r 77016:77668 svn+ssh://svn.lindenlab.com/svn/linden/branches/scrolllist_fixes svn merge -r 75889:75948 svn+ssh://svn.lindenlab.com/svn/linden/branches/simcrash-economy-fix svn merge -r 77312:77356 svn+ssh://svn.lindenlab.com/svn/linden/branches/revoke-gods plus addition to MANIFEST for revoke-gods Actual merge: svn merge -r 77525:77696 svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-2008-01-15-a * QAR-177 Linux Voice Support Merge BuildMe * QAR-197 merge of scrolllist_fixes into release for 1.19.0 (plus QAR-216 additions) * QAR-194 simcrash-economy-fix * QAR-201 Revoke gods added to deploy
2008-01-15Handle SVN not being set as an environment variable.Josh Bell
2008-01-15Make update_version_files.py look in the environment for the location ofChristian Goetze
the svn executable, default to "svn" is not set.
2008-01-15Added workaround for popen bug in scripts/update_version_files.pyChristian Goetze
when executable is in a weird location...
2008-01-12svn merge -r76807:77355 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Viewer --> release Pick up fixes made to 1.18.6 Viewer, including: * DEV-8584 Replace "Second Life" with Channel name in viewer crash log reports * DEV-8384 Connect button doesn't enable * DEV-8408 Unable to edit First/last name and password fields in viewer login * DEV-8423 VWR-3948: Underlayers no longer removable by pie menu in Windlight, release candidates * DEV-8557 Crash on login page when using Logitech LCD Keyboard * DEV-8507 Crash reporter has no default server to send to when crashing before agent connect * DEV-8531 viewer_manifest.py broken for 64-bit builds * DEV-8286 German Translation of the "Release Keys" tab is incorrect * DEV-7419 Unable to set 'Group Access' for land that is also 'Public Access' (Was VWR-3667) * DEV-6851 Integrate html error page with client
2008-01-07svn merge -r 76923:76933 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/improved-im-for-merge --> release QAR-176 merge of Improved IM into Release
2008-01-03svn merge -r76651:76807 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Viewer --> release Pick up fixes for: * DEV-7598 VWR-3829: Cursor in Logon edit boxes difficult to see * DEV-8125 Language names need to have a consistent format in preferences drop-down * DEV-8099 SVC-1125: New Search: Beacons aren't shown when teleporting to regions with "Allow Direct Teleport" disabled * DEV-8107 Crash when connecting to older sims in llviewerparcelmgr age verification code * DEV-8130 Remove "Alternate Server" option from crash reporter since util.* no longer have public interfaces * DEV-7372 VWR-3748: Builds fail on 1.18.6 RC if not using MOZLIB due to missing #if LL_LIBXUL_ENABLED in 3 places in indra/newview/llpanellogin.cpp Plus corrected line endings for llcrashlogger.* (there's one actual change in those files, the rest is whitespace)
2008-01-03svn merge -r76207:76805 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Server --> release Pick up patches for: * DEV-7727 Simcrash caused by bots sitting on trees * DEV-8091 No-Copy can be circumvented by coalescing object with a Linden plant * QAR-173 Add content negotiation to login.cgi and transform.cgi so people can log in with llsd instead of xmlrpc
2007-12-29D'oh, try compiling before committing. (If it's any justification, CG was ↵Josh Bell
compiling so I could run home...)
2007-12-29svn merge -r 76642:76643 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenance-4-merge-76640 Redo of QAR-170, with correct range. Reviewed by CG.
2007-12-28svn merge -r 76394:76651 ↵James Cook
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Viewer to pick up LLURI escaping fix and all other changes since last sync. Not reviewed.
2007-12-21svn merge -r76302:76346 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Viewer Backport a few more fixes
2007-12-21svn merge -r74200:76302 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Viewer --> release Wheee, this was fun. Um, let's back-port fixes a little more rapidly next time. Reviewed by CG until alexandria died, did the rest by my lonesome.
2007-12-20svn merge -r74912:76207 ↵Christian Goetze
svn+ssh://svn/svn/linden/branches/Branch_1-18-6-Server -> release
2007-12-19svn merge -r75015:75150 ↵Josh Bell
svn+ssh://svn/svn/linden/branches/security-lsl-setname --> release QAR-146 Merge of fix for DEV-6375/SVC-997: llSetObjectName / Desc not properly capped.
2007-12-19svn merge -r 75354:76103 ↵Jon Wolk
svn+ssh://svn.lindenlab.com/svn/linden/branches/voice-group-moderation-3 -> release. Finished product of QAR-134
2007-12-14svn merge -c 73823 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance-4 --> release Cherry pick fix for showstopper fix: DEV-5701 / SVC-930: Prims set for sale - prices are incorrectly set when multiple prims taken to inventory and rezzed
2007-12-13Fix compilation errorJon Wolk
2007-12-07EFFECTIVE MERGE: merge release@73232 maint-viewer-2@75100 -> ↵Steven Bennetts
maint-viewer-2-merge EFFECTIVE MERGE: merge -r 74370 library-update -> maint-viewer-2-merge ACTUAL MERGE: release@75267 maint-viewer-2-merge@75293 -> release
2007-12-06Switching from XML streaming to Notation streaming for new streambase ↵Don Kjer
logging format.
2007-12-06EFFECTIVE MERGE: svn -r 74436:74675 ↵Don Kjer
svn+ssh://svn/svn/linden/branches/log-streambase-1 ACTUAL MERGE: svn merge -r 75220:75225 svn+ssh://svn/svn/linden/qa/log-streambase-1-merge-75217
2007-12-06svn merge -r 75234:75235 svn+ssh://svn/svn/linden/branches/maintenance-5 ↵Don Kjer
into release Fix for simulator crash (null pointer dereference during lldebugs)
2007-12-06EFFECTIVE MERGE: svn merge -r 73781:75018 ↵Don Kjer
svn+ssh://svn/svn/linden/branches/FixGroupVotes into release ACTUAL MERGE: svn merge -r 75163:75166 svn+ssh://svn/svn/linden/qa/FixGroupVotes-merge-75160 into release
2007-12-05EFFECTIVE MERGE: svn merge -r 71520:73420 ↵Don Kjer
svn+ssh://svn/svn/linden/branches/maintenance-3 into release ACTUAL MERGE: svn merge -r 75074:75114 svn+ssh://svn/svn/linden/qa/maintenance-3-merge-75067 into release
2007-12-05removed use of typeid()Aaron Brashears
2007-12-05Result of svn merge -r74235:74242 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/robust-pump into release
2007-12-04EFFECTIVE MERGE: maint-ui-qa3 -r 73391:74133 -> releaseSteven Bennetts
ACTUAL MERGE: merge release@74893 maint-ui-3-merge@74902 -> release
2007-12-03svn merge -r 74415:74849 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-5-Viewer --> release Last of the fixes from 1.18.5 Viewer RC series
2007-12-03-74901 (back out premature commit to release)Steven Bennetts
2007-12-03merge -r 73391:74133 maint-ui-3 -> releaseSteven Bennetts
2007-12-01 svn merge -r74808:74832 svn+ssh://svn/svn/linden/branches/qa-dpo-9aChristian Goetze
2007-11-30Trivial change to not print an error from a library (was blocking use in ↵Josh Bell
CGIs). Suggested by donovan.
2007-11-28Pick up patches from 1.18.6 production branchJosh Bell
svn merge -c 74225 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Server svn merge -c 74273 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Server svn merge -c 74366 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Server svn merge -c 74424 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Server svn merge -c 74444 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Server svn merge -r 74473:74631 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Server
2007-11-27svn merge -r 72903:73200 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-5-Server --> release Missed merge range in release r74199. Josh is an idiot.
2007-11-26svn merge -r 74317:74381 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-5-Viewer --> release
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 14:38:40 +0000