Age | Commit message (Collapse) | Author | |
---|---|---|---|
2010-11-05 | Merge latest lindenlab/viewer-development with mani_linden/viewer-development. | brad kittenbrink | |
2010-11-01 | VWR-23666 Removed setting VersionChannelName. LLVersionInfo::resetChannel() ↵ | Mark Palange (Mani) | |
and unit tests. Reviewed by brad. | |||
2010-10-21 | Automated merge up from viewer-development | Loren Shih | |
2010-09-16 | debug code for SH-115: investigate texture related network traffic between ↵ | Xiaohong Bao | |
viewer 2.x and 1.23. | |||
2010-09-03 | Post-convert merge by convert_monolith.py from ↵ | Aimee Linden | |
/Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution | |||
2010-09-03 | Merge between james/viewer-identity-evolution and dessie/viewer-public | Aimee Linden | |
2010-08-24 | Backed out changeset c3d41f18ce2b | Tofu Linden | |
back-out the back-out for this branch. yay. | |||
2010-08-24 | Backed out changeset a62bf7c0af21 | Tofu Linden | |
Backing out this merge that I pushed (prematurely) to the wrong place. | |||
2010-08-24 | merge heads. whew. | Tofu Linden | |
2010-08-13 | Change license from GPL to LGPL (version 2.1) | Oz Linden | |
2010-08-05 | adding DisplayNamesEnabled and DisplayNamesShowUsername to the top level of ↵ | Leyla Farazha | |
our viewer stats | |||
2010-07-27 | Backed out changeset: 58571b4e704b | Richard Linden | |
2010-07-15 | Reverted changeset 2bb10eae42bf | Dessie Linden | |
2010-07-14 | Merged from viewer-release | Dessie Linden | |
2010-07-13 | Added AgentPositionSnaps data to ViewerStats to measure frequency and scale ↵ | Matthew Breindel (Falcon) | |
of interpolation failures. | |||
2010-05-12 | merge from viewer-public | Tofu Linden | |
2010-04-07 | Re-insert backed out SLE checkin so we can fix it | Roxie Linden | |
2010-04-07 | Backed out changeset 63b699f90efd | Tofu Linden | |
2010-04-01 | Automated Merge | Roxie Linden | |
2010-03-25 | automated merge | Loren Shih | |
2010-03-23 | EXT-2959 : Full out camera functions from llagent to llagentcamera | Loren Shih | |
First check-in; only compiles, nothing more. | |||
2010-03-22 | Weekly automated merge from viewer 2.0 | Roxie Linden | |
2010-03-17 | EXT-6419 Adding comma to viewer stats texture time output | Palmer Truelson | |
2010-03-17 | EXT-6419 : Adding texture time metric to viewer stats | Palmer Truelson | |
Reviewed by Mani | |||
2010-03-20 | Tweak detail settings and make graphics preferences widget enabling respect ↵ | Dave Parks | |
requirements. | |||
2009-12-18 | HTTP Texture tuning: | Steve Bennetts | |
* Changed download rate update frequency * Updated network bandwidth preferences to be 100 Kbps - 10 Mbps instead of 50 Kbps - 1.5 MBps | |||
2009-11-13 | Refactoring of llviewerprecompiledheaders.h to hopefully increase stability | brad kittenbrink | |
and reduce unnecessary dependencies and incredibuild wedging. Hopefully in the long run this will reduce build time. Also cleaned up a lot of header file usage to conform better to the coding standard. reviewed by james and steve. | |||
2009-11-10 | Sanitize naming of getWindowRect (scaled vs. raw pixels) and ↵ | James Cook | |
getWorldViewRect (scaled vs. raw) Reduces chance of future UI bugs related to UI size. Discussed with Richard. | |||
2009-11-06 | merge QAR-1829: texture pipeline branch in viewer-2.0.0.3 | Xiaohong Bao | |
2009-10-19 | DEV-41358: Remove the code for the old search interface. | Martin Reddy | |
This checkin deletes all of the code associated with the old XUI-based search interface, including LLFloaterDirectory, LLPanelDir*, a global variable event hack, and the associated XUI file. The new web-based search interface, LLFloaterSearch, is the way of the future. Deleted 19 files and 5,838 lines of code. | |||
2009-08-27 | svn merge -r 129841:129910 ↵ | Monroe Williams | |
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910 svn merge -r 129913:131718 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05 Some branch shenannigans in the pluginapi_05 branch caused this to become a two-part merge. | |||
2009-08-24 | merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3 | Richard Nelson | |
DEV-11254 DEV-11254 DEV-2003: DEV-21567 DEV-37301 EXT-104 EXT-138 EXT-217 EXT-256 EXT-259 EXT-259 EXT-328 EXT-348 EXT-386 EXT-399 EXT-403 EXT-460 EXT-492 EXT-492 EXT-531 EXT-537 EXT-684 improved text editor (handles multiple fonts simultaneously as well as inline widgets) | |||
2009-07-10 | merge QAR-1579: texture-cleanup-1. | Xiaohong Bao | |
2010-02-01 | Merge giab-viewer-trunk 2497, general merge of more | Roxie Linden | |
secapi stuff as well as certificate handling stuff. Grid manager as well | |||
2009-06-21 | merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 | Steven Bennetts | |
ignore-dead-branch | |||
2009-02-18 | Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 ↵ | Brad Kittenbrink | |
(maint-render-9) and QAR-1236 (dll-msvcrt-2) svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833 | |||
2009-02-03 | svn merge -r107016:108767 ↵ | Mark Palange | |
svn+ssh://svn.lindenlab.com/svn/linden/viewer/viewer_1-22 Merge back of viewer 1.22 RC6 and RC7 change to trunk. QAR-1214 and QAR-1227 | |||
2009-02-03 | QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergeme | Adam Moss | |
svn merge -r108355:109316 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/maint-viewer-12-uploadfees-qa108314 Whew. | |||
2009-01-08 | Result of svn merge -r107256:107258 ↵ | Aaron Brashears | |
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 | |||
2008-12-23 | QAR-1142 merging 1.22 RC0-RC4 changes. | Mark Palange | |
svn merge -c 106471 svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_1-22-106055_merge | |||
2008-11-19 | QAR-1018 Lightweight Windows Setup App (windows-setup-3). svn merge ↵ | James Cook | |
-r102882:102883 svn+ssh://svn.lindenlab.com/svn/linden/branches/windows-setup/windows-setup-3-merge | |||
2008-09-12 | QAR-855 Viewer 1.21 RC 2 | Steven Bennetts | |
merge viewer_1-21 94770-96059 -> release | |||
2008-08-28 | merge viewer/viewer_1-21 94170-94770 -> release | Steven Bennetts | |
merge viewer/viewer_1-21-0 94830-95157 -> release Includes: QAR-786 Sandbox buildme for viewer + server Release Notes on the wiki! QAR-797 teleport failures (DEV-6198 / SVC-972) mergeme | |||
2008-06-27 | QAR-669 1.20 Viewer RC11 | Steven Bennetts | |
QAR-648 1.20 Viewer RC10 merge Branch_1-20-Viewer-2 -r 88724:90511 -> release | |||
2008-06-26 | QAR-628 merge string-cleanup-5 -r 90476:90508 -> release | Steven Bennetts | |
dataserver-is-deprecated | |||
2008-06-02 | svn merge -r88066:88786 ↵ | Bryan O'Sullivan | |
svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge dataserver-is-deprecated for-fucks-sake-whats-with-these-commit-markers | |||
2008-05-09 | QAR-565 search-milestone2-merge (more web tabs in search) | Steven Bennetts | |
dataserver-is-deprecated | |||
2008-04-01 | merge release@83343 skinning-1-merge@83714 -> release | Steven Bennetts | |
QAR-424 | |||
2008-02-27 | Merge of windlight into release (QAR-286). This includes all changes in | Brad Kittenbrink | |
windlight14 which have passed QA (up through r79932). svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620 | |||
2007-12-21 | svn 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. |