summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2007-07-03Fixed VS8 project files for sse-skinning merge.James Cook
2007-07-02svn merge -r 62595:62596 and 62598:63308 sse-skinning-3 for faster software ↵James Cook
avatar rendering. Visual Studio 2005 project file fixed pending.
2007-07-02svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into ↵Don Kjer
release
2007-06-30Backed out revision 64585. Not reviewed.Nathan Savage
2007-06-30Version 1-17-2-64582 based on svn revision 64582.Nathan Savage
2007-06-29revert: svn merge -r 64506:64505 svn+ssh://svn/svn/linden/release back into ↵Don Kjer
release reverting jakes accidental check in
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-25svn merge -r 63827:63826 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release Revert fix for SL-33506/VWR-53, which was causing SL-46205 "Head is invisible in appearance editor"
2007-06-22Release branded as 1.17.1.0 with release notes.Anthony Foster
2007-06-22Tweak initializer order to silence a gcc warning (now treated as error)Josh Bell
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-22svn merge -r 63401:63939 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/derez-asset-loss-1 --> release NOTE: Skipped whitespace-only changes
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-12svn merge -r 62560:62559 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance Revert bad patch for VWR-849 / SL-43759
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-09svn merge -r 63284:63298 ↵Don Kjer
svn+ssh://svn/svn/linden/branches/content-loss-metrics-4 into release
2007-06-05Removing a bug that addressed a coverity defect. This change is done in ↵Anthony Foster
maintenance, r-c, and release. Maintenance r63092 Reviewed by Richard.
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-21Copyright info added to llcurlSteven Bennetts
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-07svn merge -r 61367:61368 svn+ssh://svn/svn/linden/branches/maintenance into ↵Don Kjer
release -- porting test spam removal
2007-05-04svn merge -r 61148:61343 svn+ssh://svn/svn/linden/branches/maintenance into ↵Don Kjer
release
2007-05-03Result of svn merge -r59717:60410 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/adroit.2007-03-13 into 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-03Syncing missing changes in maintenance to releaseDon Kjer
2007-05-03Syncing up missing changes from release-candidateDon Kjer
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 61099:61168 svn+ssh://svn/svn/linden/branches/release-candidate ↵Don Kjer
into 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.
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-31 19:36:57 +0000