Age | Commit message (Collapse) | Author | |
---|---|---|---|
2016-01-15 | merge changes for 4.0.1-release | Oz Linden | |
2015-11-10 | remove execute permission from many files that should not have it | Oz Linden | |
2015-10-05 | MAINT-1390 FIXED Top colliders floater reopens itself if it was closed at ↵ | Mnikolenko ProductEngine | |
once after opening | |||
2014-08-06 | merge changes for STORM-2031 | Oz Linden | |
2014-05-13 | STORM-2031 Display issues with Top colliders/Top scripts floater | Jonathan Yap | |
OPEN-217 Change to media_plugin_quicktime.cpp causes Windows compile to fail | |||
2014-05-12 | STORM-2030 Rapidly clicking the refresh button in selected floaters may ↵ | Jonathan Yap | |
result in duplicate entries | |||
2013-03-29 | Update Mac and Windows breakpad builds to latest | Graham Madarasz | |
2012-12-05 | CHUI-580 : WIP : Change the display name cache system, deprecating the old ↵ | Merov Linden | |
protocol and using the cap (People API) whenever available. Still has occurence of Resident as last name to clean up. | |||
2012-06-27 | MAINT-1173 : Top Scripts: Break down usage by parcel. Follow-on code to add | simon@Simon-PC.lindenlab.com | |
per-parcel filtering. Reviewed by Kelly | |||
2012-06-25 | MAINT-1173 : Top Scripts: Break down usage by parcel. Reviewed by Kelly | simon@Simon-PC.lindenlab.com | |
2011-04-01 | STORM-1130: Top Scripts: Date/time sorting is broken (sorts lexically) | Joshua Bell | |
Use LLScrollListCtrl's intrinsic support for date-typed columns. | |||
2011-03-22 | ER-320 Fix public urls in top scripts. | Kelly Washington | |
2010-09-27 | Merge | Leyla Farazha | |
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-27 | Post-convert merge by convert_monolith.py from ./viewer-experience | Monroe 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-16 | moved buildFloater out of lluictrlfactory to llfloater.cpp | Richard Nelson | |
2010-08-13 | Change license from GPL to LGPL (version 2.1) | Oz Linden | |
2010-07-30 | deprecated LLPanel::child*() methods | Richard Nelson | |
2010-05-27 | DEV-50013 Region debug top scripts/colliders display names | James Cook | |
2010-05-11 | merge from dessie/viewer-public right before SLE code landed | James Cook | |
2010-03-29 | EXT-5940 : Typedef all vector<LLUUID>'s | Loren Shih | |
Superficial cleanup to change all typedef std::vector<LLUUID> to use a common typedef uuid_vec_t instead. | |||
2010-03-02 | Merge | James Cook | |
2010-02-23 | DEV-46407 Region Debug Tab Top Scripts table contains SLID with Resident | James Cook | |
Fixed for Top Colliders too | |||
2010-02-13 | CID-145 | Tofu Linden | |
Checker: NULL_RETURNS File: /indra/llui/llscrolllistctrl.cpp | |||
2009-12-19 | Added a first view script limits floater | gabriel | |
reviewed by Mani | |||
2009-11-25 | Created lightweight LLNotificationsUtil::add(), switched most alerts to use it | James Cook | |
Cuts number of includes of llnotifications.h from 300+ to 40. | |||
2009-11-24 | Removed include llnotifications.h from llfloater.h trying to speed builds | James Cook | |
Fixed many other includes related to this file. Cleaned out llfloatertestlistview to be an empty test floater. | |||
2009-07-07 | Merge skinning-14 to viewer-2, including refactoring many floaters to ↵ | James Cook | |
register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files: lldraghandle.h, lluictrl.h, llchiclet.cpp, llfolderview.h/cpp, lliinventorybridge.cpp, llpanelpicks.cpp, llviewermenu.cpp, floater_mute.xml, floater_preferences.xml, notifications.xml, panel_preferences_audio.xml, panel_preferences_graphics1.xml, panel_region_general.xml svn merge -r124961:126284 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-14 | |||
2009-06-21 | merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 | Steven Bennetts | |
ignore-dead-branch | |||
2009-02-24 | merge -r 112783:112799 linden/branches/kelly/lsl-http-in-merge to linden/trunk | Kelly Washington | |
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 | |||
2009-01-05 | svn merge -r106715:HEAD ↵ | Kent Quirk | |
svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk. | |||
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-07 | QAR-992 Merging revisions 101012-101170,101686-101687 of ↵ | Mark Palange | |
svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into linden/release | |||
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-08-12 | QAR-767 Combined maint-render-7 and maint-viewer-9 merge | Steven Bennetts | |
merge release@93398 viewer-merge-1@94007 -> release dataserver-is-deprecated | |||
2008-07-31 | svn merge -r93014:93396 ↵ | Dave Hiller | |
svn+ssh://svn.lindenlab.com/svn/linden/branches/mono-r93014-qar633 dataserver-is-deprecated | |||
2008-07-18 | merge support-featurettes-snapshot-merge-2 for QAR-754, includes: | James Cook | |
* featurettes-4 89061:89589 (which is all of featurettes-1, -2, and -3, and part of -4) * gteam-showstoppers-3 91950:91951 (which is all of gteam-showstoppers-1, -2, and -3) * featurettes-5 92149:92150 (patch for last line of chat text not visible in chat history, DEV-17771) * snapshot-3 91988:91991 (which is all of snapshot-1, -2, and -3) Merging revisions 92190-92387 of svn+ssh://svn.lindenlab.com/svn/linden/branches/support-featurettes-snapshot-merge-2 into release, respecting ancestry * QAR-590 Merge Lock Request for Support Sprint * QAR-627 Merge snapshot improvements * QAR-686 Merge Lock request for Featurettes | |||
2008-06-26 | QAR-628 merge string-cleanup-5 -r 90476:90508 -> release | Steven Bennetts | |
dataserver-is-deprecated | |||
2008-04-01 | merge release@83343 skinning-1-merge@83714 -> release | Steven Bennetts | |
QAR-424 | |||
2008-02-19 | merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r ↵ | Steven Bennetts | |
79986 : 80178 -> release. QAR-290 = QAR-271 + QAR-191 | |||
2007-12-19 | svn 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-10-04 | Result of svn merge -r71162:71205 ↵ | Aaron Brashears | |
svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. | |||
2007-07-02 | svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into ↵ | Don Kjer | |
release |