summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterevent.cpp
AgeCommit message (Collapse)Author
2010-08-24Backed out changeset a62bf7c0af21Tofu Linden
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24merge heads. whew.Tofu Linden
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-07-30deprecated LLPanel::child*() methodsRichard Nelson
2010-04-19automated merge with trunkRoxie Linden
2010-04-14Fixed EXT-6349(normal) - "More" link in event details window does nothingDmitry Zaporozhan
Deleted code that disables expandable textbox. Probably there was edit_box, some time ago, that was read-only. Reviewed by Vadim Savchuk - https://codereview.productengine.com/secondlife/r/235/ --HG-- branch : product-engine
2010-04-07Re-insert backed out SLE checkin so we can fix itRoxie Linden
2010-04-07Backed out changeset 63b699f90efdTofu Linden
2010-03-01Automated merge from trunkRoxie Linden
2010-02-26automated mergeRoxie Linden
2010-02-26EXT-5679 Event details shows maturity incorrectly.Leyla Farazha
reviewed by Richard
2010-02-12fixing windows eolLeyla Farazha
2010-02-12EXT-5050 Make sure there is a Delete button in God Mode and that it worksLeyla Farazha
reviewed by Monore CC# 108
2010-02-11EXT-5044 substasks: turning the event panel into an event floater.Leyla Farazha
reviewed by Richard.
2009-08-04svn merge -r 128442:129343 ↵Richard Nelson
svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
ignore-dead-branch
2009-01-08Result of svn merge -r107256:107258 ↵Aaron Brashears
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2008-12-15svn merge -r105329:105903 ↵Melinda Green
svn+ssh://svn/svn/linden/branches/featurettes/featurettes-batch4-merge Resolving QAR-1051 Merge featurettes batch #4
2008-04-01merge release@83343 skinning-1-merge@83714 -> releaseSteven Bennetts
QAR-424
2008-02-01merge Branch_1-19-0-Viewer -r 78432:78989 -> releaseSteven Bennetts
QA'd in QAR-186: DEV-9179: Commit translated and reviewed strings from 1.19 frozen branch pull DEV-8792 Place information teleport button hidden behind chat bar. DEV-9374: Remove "New Account..." and "Preferences" buttons from login screen for 1.19.0 DEV-9411 -- Update required version of Quicktime library to 7.4 for 1.19.0 Viewer DEV-9430 Viewer auth failed login screen is shown in the loginxui 1.19 viewer on failure to retrieve normal login screen - changed wording of error page DEV-8537 Chat console appearing underneath status buttons DEV-9283 Chatbar cant be open while in mouselook DEV-9226 Some Dazzle? icons have sneaked into the release branch DEV-9520 Menus and Other items minimise behind onscreen buttons DEV-9521 Unable to ctrl and click to select in the friends list DEV-9530 SEC-20 Exploit to force users to teleport to a location on profile open. DEV-6833 - Mature events icon and checkbox is missing from map legend Also: Added vc9 project files (+ minor changes for vc9) (steve) Modified vc project files to not include the path for flex / bison (steve) Added marker file deletion to crash logger to stop double reporting. (cube)
2008-01-24DEV-9328 DEV-9330 DEV-9334 Fixed license information in source files to ↵James Cook
match the wiki [[License Substition]] standard. Commit to release OK by Josh/Jwolk.
2007-11-20svn merge -r 73926:74098 svn+ssh://svn/svn/linden/branches/viewer-auth-7Tess Chu
2007-11-15svn merge -r73880:73879 svn+ssh://svn/svn/linden/release. backing out viewer ↵Tess Chu
auth merge
2007-11-15svn merge -r73220:73877 svn+ssh://svn/svn/linden/branches/viewer-auth-6Tess Chu
2007-11-01svn merge -r 72652:72881 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/sl-search-11 --> release QAR-11: pair-reviewed the merge w/ Sam.