summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2007-06-29Changes to make Logitech code more LL Code Standards compliant, plus remove ↵Jake Simpson
all the SDK code and instead just used headers and an included lib that we build ourselves from the Trunk directory.
2007-06-28Setting some shader svn:eol-style properties to native to prevent conflicts ↵Brad Kittenbrink
in windlight4 branch.
2007-06-26Merge fix for SL-46373 / VWR-1369 / Intermittent Crash on Edit from Pie MenuJosh Bell
NOTE: Only a partial merge from maintenance!!!! svn merge -r 64309:64310 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-06-25Bumping version numbers to 1.17.2.0 for possible Rolling Server deployJosh Bell
2007-06-25Updated German text as per changes from Christian (Goetze)Callum Prentice
(https://jira.lindenlab.com/browse/SL-46075)
2007-06-25Lost changes to some virtual function overrides.Samantha Patterson
2007-06-22Release branded as 1.17.1.0 with release notes.Anthony Foster
2007-06-22"Merged" over from release-candidate - addition of Japanese and German ↵Callum Prentice
options in Installer language menu Add German option to the language menu in the installer. https://jira.lindenlab.com/browse/SL-45054 Addition of Japanese language option to the installer. https://jira.lindenlab.com/browse/SL-45907
2007-06-21merge -r62831:64079 branches/maintenance to releaseKelly Washington
2007-06-17svn merge -r 63833:63894 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-17-0 --> release Pick up patches committed to 1.17: * Commented out metrics code that seems to be causing a crash. * Adding metrics to deployed code. added missing __hash__ function to lluuid.py, which fixes using uuid's as keys in maps * Reverting fix for SL-25905; probably cause of script-vieweing exploit on agni. * Removed deploy key checks from farm
2007-06-13result of merge manually performed through diff and patch. svn diff ↵Aaron Brashears
svn+ssh://svn/svn/linden/release@63615 svn+ssh://svn/svn/linden/branches/release-candidate@63637 | patch -p0 in release
2007-06-11fix for crash because of recent changes in tool handleSelect() from Richard. ↵Aaron Brashears
SL-44935
2007-06-11NOTE: Partial merges of the maintenance branch up. The bulk of maintenance ↵Josh Bell
62831:63347 is awaiting final QA and merging, post 1.17.0 svn merge -r 63182:63183 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release svn merge -r 63341:63342 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release svn merge -r 63420:63421 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release Rush in the following fixes: * SL-27250 "Stop All Animations" doesn't work when stuck in a pose after teleporting * SL-44718 VWR-1040: crash when opening several gestures quickly * SL-44326 recurring error message in agni nightly #1
2007-06-04svn merge -r 62602:62831 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-05-30merge -r61423:62602 svn/branches/maintenance --> releaseKelly Washington
2007-05-26land mozilla-https-fix branch, -> releaseAdam Moss
2007-05-23svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@62339 ↵Brad Kittenbrink
svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate62341 -> release
2007-05-15Merge all of the patches made to Branch_1-15-1 back into release:Josh Bell
* Release notes for 1.15.1(3) * Updated contributors list * Revert apr libraries (NOTE: Also done in maintenance, this should be a no-op...) * Fix for SL-42640 Entering appearance mode triggers "items coming too fast" * Fix for SL-42257 Mute Resident button does not open the user picker svn merge -r 61568:61569 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-15-1 --> release svn merge -r 61585:61586 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-15-1 --> release svn merge -r 61601:61602 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-15-1 --> release svn merge -r 61761:61762 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-15-1 --> release svn merge -r 61777:61778 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-15-1 --> release svn merge -r 61805:61806 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-15-1 --> release svn merge -r 61824:61825 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-15-1 --> release
2007-05-15Version 1.15.2.0 (serverside only).Lee Montgomery
2007-05-08svn merge -r 61343:61423 svn+ssh://svn/svn/linden/branches/maintenance into ↵Don Kjer
release
2007-05-08Removing Logitech LCD code: svn merge -r 60616:60615 ↵Don Kjer
svn+ssh://svn/svn/linden/release into release
2007-05-07Version 1.15.1.0.Lee Montgomery
2007-05-07merge -r61253:61354 branches/friends_1-15 to release, minus some spam.Kelly Washington
2007-05-04svn merge -r 61148:61343 svn+ssh://svn/svn/linden/branches/maintenance into ↵Don Kjer
release
2007-05-03Attempt to revert release r61312 checkin. Whitespace onlyArthur Abraham
2007-05-03Reverting check-in to release with no QA... svn merge ↵Don Kjer
svn+ssh://svn/svn/linden/release -r 61312:61311
2007-05-03Solves SL-23488Arthur Abraham
2007-05-02svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into ↵Don Kjer
release
2007-05-02svn merge -r 61255:61259 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate --> release
2007-05-01svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate ↵Don Kjer
into release
2007-04-24Font noticesRob Lanphier
2007-04-18svn merge -r 59608:60615 ↵Jake Simpson
svn+ssh://svn.lindenlab.com/svn/linden/branches/jakesbranch --> release Adding Logitech G15 keyboard and Z10 speaker support for those LCD windows.
2007-04-18A handful of source files had the svn:executable property set. Not any more.Josh Bell
2007-04-18SL-24485, SL-40331, SL-23136, SL-40330, SL-25816, SL-40567,Adam Moss
SL-40568: land moss/linuxmisc-r60383: misc linuxclient & opensource fixes. svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@60383 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/linuxmisc-r60383 -> release
2007-04-11svn merge -r 59968:60342 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-04-07Fixed Mac compiler warnings for deployment builds.James Cook
2007-04-07Fix Mac compiler warning for deployment builds.James Cook
2007-04-05svn merge -r 59234:60086 svn+ssh://svn/svn/linden/branches/live_lsl_help2 -> ↵Richard Nelson
release
2007-04-04SL-21064 Made it so you can now check physical, temporary, and phantom for ↵Dave Kaprielian
multiple-selected objects. Reviewed by Richard.
2007-04-04svn merge svn+ssh://svn/svn/linden/branches/maintenance -r 59998:59999 into ↵Don Kjer
release Fix for groups showing up as 'nobody'
2007-04-04svn merge -r 59826:59968 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-04-03merge -r 59337:59951 Branch_1-14-0 -> release.Steven Bennetts
2007-03-31svn merge -r 59364:59813 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-03-28Added highlighting for parcel flag object entry constantsKyle Machulis
2007-03-26Effectively: merge 59238:59702 Branch_1-13-4 --> release EXCEPT for the back ↵Josh Bell
out (r59497) and re-patch (r59531) of upload-queue, and fixes merged directly from Maintenance. merge -r 59328:59428 Branch_1-13-4 --> release * address regex needs "s" option to support multiline addresses. Patched previously, not sure how it got dropped. * added new promo code to accommodate printer error * Fix for SL-37108 "SVC-55: look at may be broken" * Paired/reviewed with Qarl * Release notes for Release Notes for 1.13.4(59329) * merge release-candidate@58928 long-live-legacy-particles@59317 -> Branch_1-13-14 SKIP -r 59428:59437 (temporary), 59437:59465 (from release), 59465:59497 (back out of upload-queue) merge -r 59497:59510 Branch_1-13-4 --> release * SL-37932 legacy particle clean up * SL-33228 llParticleSystem( [] ) may not shut down reliably * SL-37909 llParticleSystem([ ]) bug now affects unlinked and root prims SKIP -r 59510:59531 (re-patch of upload-queue) merge -r 59531:59585 Branch_1-13-4 --> release * blacklist and release notes updates SKIP -r 59585:59656 (patches from maintenance) merge -r 59656:59691 Branch_1-13-4 --> release * blacklist and release notes updates SKIP -r 59691:59702 (already ported to release)
2007-03-22I broke linux and mac builds, reverting the changes from 59596Kelly Washington
2007-03-22Couple steps closer to compiling on VC8, new boost headers and libs.Kelly Washington
2007-03-21svn merge -r 59178:59364 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-03-20svn merge -r59459:59476 ↵Karen Clark
svn+ssh://svn.lindenlab.com/svn/linden/branches/adroit.r69-75_2 into svn+ssh://svn.lindenlab.com/svn/linden/release.
2007-03-16merge -r 59028:59178 maintenance -> release.Steven Bennetts
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-01 18:27:34 +0000