summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2007-09-21svn merge -r69926:70272 lag-meter, to pick up fixes for shrunk view, icon ↵James Cook
layout and ping time testing. QA passed by Devin.
2007-09-21James discovered a bug in the minifriends code that can be triggered when ↵Melinda Green
running a new viewer build with VS2005 talking to an old simulator. This change works around that problem and was reviewed by James.
2007-09-20svn merge -r 69597:70080 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-3-Viewer --> release Merge patches made in the 1-18-3 RC iterations into the trunk. * SL-55085 Login hangs if optional update is declined. * SL-55123 Mac app icon missing from open source tarball * SL-55121 Mac mouse cursors missing from open source tarball * SL-54978 Remove duplicate code that snuck in during a patch merge * SL-54633 VWR-2378: Failure to enable the "Update" button in the profile/classifieds tab, after a "Set Location" update * Release notes/version numbers
2007-09-19Passed QA, merging minifriends-3:70006 back to releaseMelinda Green
2007-09-19svn merge -r 69906:69926 ↵James Cook
svn+ssh://svn.lindenlab.com/svn/linden/branches/lag-meter. Adds "Lag Meter" option to "Help" menu to give users more useful diagnostics when they see "laggy" behavior.
2007-09-17svn merge -r 68785:68784 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance Revert change for SL-51198 ("VWR-2072: New Feature -> UI -> IM -> Teleport (other person) Button"), per Ben - more comprehensive design coming through Rx soon.
2007-09-14EFFECTIVE MERGE: svn merge -r 68118:68999 ↵Don Kjer
svn+ssh://svn/svn/linden/branches/maintenance ACTUAL MERGE: svn merge -r 69685:69687 svn+ssh://svn/svn/linden/branches/release-r69649-maintenance-sync EQUIVALENT TO: svn merge -r 68118:69663 svn+ssh://svn/svn/linden/branches/maintenance-r68999
2007-09-13svn merge -r 68690:69597 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-3-Viewer --> release Merge patches made in the 1-18-3 RC iterations into the trunk. NOTE: Includes the reversion of SL-51274 (originally maintenance r67559, changed lltracker.cpp)
2007-09-13svn merge -c 68578 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-3-Viewer --> release Re-apply reversion from RC branch. This was un-reverted by the dpo-4 merge.
2007-09-13svn merge -c 68568 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-3-Viewer --> release Re-apply reversion from RC branch. This was un-reverted by the dpo-4 merge.
2007-09-13Result of svn merge -r64890:69433 svn+ssh://svn/svn/linden/branches/dpo-4 ↵Aaron Brashears
into release. had to blow away the libraries directory to clear up svn evil.
2007-09-11Merge sl-search-m0 back into releaseSam Kolb
2007-09-10SL-53811, SL-53812, SL-53823, SL-26604, SL-54282 Linux filepickersAdam Moss
revamp. Passed by QA. Reviewed by bos. svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@68938 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/SL-26604-based-on-r68938 -> release
2007-09-07SL-51287 Muted users not visibly shown anymoreSteven Bennetts
SL-54168 "Users muted by voice are also muted by text". Updated Vivox SDK 2.0.2318. (josh: This appears to be svn merge -r 68529:69170 svn+ssh://svn/svn/linden/branches/bhear3-maintenance1)
2007-08-30Merge sl-search-opt-in back into the release branchSam Kolb
Reviewed by Josh and Don
2007-08-29svn merge -r67650:68653 branches/release-viewer-statsBryan O'Sullivan
Branch reviewed by Don. Passed QA buildme this morning. NOTE: This change requires a DB schema upgrade. Upgrade script: indra/upgrade/viewer-stats/redo_viewer_stats
2007-08-28svn merge -r 68474:68690 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-3-Viewer --> release Sync up fixes, version numbers, and release notes applied to the viewer RC branch.
2007-08-21EFFECTIVE MERGE: svn merge -r 66133:68118 ↵Christian Goetze
svn+ssh://svn/svn/linden/branches/maintenance into release Actual action: branched maintenance-r68118, merged in release, then copied result into release
2007-08-14svn merge -r 67483:67657 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-1 This is "really" the merge of everything that went out in the 1.18.2(0) viewer release.
2007-08-14* Update versions (client + server) to 1.18.2.0Josh Bell
* Tweak simulator_version script to slam all regions to the new version we're deploying
2007-08-10merge -r 66233:67472 svn+ssh://svn/svn/linden/branches/het-grid-4 Paired by ↵Tess Chu
Tess and Leyla. Added tests to version manager and fixed failed tests. Paired by rdw and Tess.
2007-08-08svn merge -r67131:67483 svn+ssh://svn/svn/linden/branches/Branch_1-18-1Kartic Krishnamurthy
2007-08-02Merge down from Branch_1-18-1:Monroe Williams
svn merge --ignore-ancestry svn+ssh://svn.lindenlab.com/svn/linden/release@66449 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-1@67131
2007-07-31svn merge -r 64468:66735 ↵Melinda Green
svn+ssh://svn/svn/linden/branches/lookatyou/indra/newview > release/indra/newview
2007-07-27merge -r 66456:66594 Branch_1-18-1 -> releaseSteven Bennetts
Includes voice-server-changes (0:66493)
2007-07-26merge -r66262:66263 linden/branches/kelly/llgetobjectdetails-2Kelly Washington
2007-07-26EFFECTIVE MERGE: svn merge -r 65485:66133 ↵Don Kjer
svn+ssh://svn/svn/linden/branches/maintenance into release This includes fixes to the maintenance-r66133 branch, and sync'ing up with release@r66392 ACTUAL MERGE: svn merge -r 66394:66435 svn+ssh://svn/svn/linden/branches/release-r66392 into release EQUIVALENT TO: svn merge -r 65485:66434 svn+ssh://svn/svn/linden/branches/maintenance-r66133 into release (plus branch sync'ing)
2007-07-24Minor bugfixes for a line in viewer_manifest that never gets run (because of ↵Ryan Williams
the way the SConstruct file on Linux is built). However, it might get run in the future, so there we go. Thanks cg for finding this. Not reviewed.
2007-07-20svn merge -r 64548:64837 svn+ssh://svn/svn/linden/branches/maintenance into ↵Don Kjer
release * WARNING *: maintenance r64837 is not the last rev to use in the next merge. use r65269
2007-07-18svn merge -r64837:65485 ↵Bryan O'Sullivan
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release (only inside indra) (josh) Original log message was: svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance bos updated it to be: svn merge -r64837:65269 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance However, it appears it actually was: svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance ... missing some file additions.
2007-07-18svn merge -r63705:65463 svn+ssh://svn/svn/linden/branches/dpo-3-bug-fixKartic Krishnamurthy
NOTE: r63705 is *not* the earliest rev# for dpo-3-bug-fix.
2007-07-16Result of svn merge -r65183:65337 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/python-shuffle into release. Also includes untabification of many python files.
2007-07-16SL-24190 'Streaming video support for Linux'Adam Moss
QA'd. svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@65172 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/SL-24190i-based-on-r65172
2007-07-12Fix build borkage on OS X.Bryan O'Sullivan
2007-07-12svn merge -r65092:65220 ↵Bryan O'Sullivan
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance-r64837
2007-07-11Fixed a build error under XCode due to unused file static variable.Brad Kittenbrink
2007-07-11svn merge -r 65078:65118 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate --> release Sync up last minute patches that went into 1.18.
2007-07-11svn merge --ignore-ancestry svn+ssh://svn/svn/linden/release@65088 ↵Tess Chu
svn+ssh://svn/svn/linden/branches/release-candidate@65078 -> release Paired by Tess and rdw.
2007-07-11SL-47720 Crash on startup due to SSE instructions. Disable SSE code ↵James Cook
generation on Windows build. This prevents global constants from being initialized with SSE instructions. We can use the SSE code on Intel Mac (since they all support SSE) and if we enable SSE compilation for the entire Windows viewer. Reviewed by Kelly.
2007-07-05Version 1.17.3.0.Lee Montgomery
2007-07-03Fixed broken Mac universal build due to missing files and bad LL_VECTORIZE ↵James Cook
ifdef for sse-skinning code.
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-30 16:30:43 +0000