summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaternamedesc.cpp
AgeCommit message (Collapse)Author
2010-03-30HUGE merge from viewer-trunk. Many conflicts resolved.Tofu Linden
2010-03-24Hooked up Save As Profile PicLeyla Farazha
reviewed by Richard CC# 167
2010-02-05EXT-5025 - Tooltips block mouse clicksrichard
EXT-4547 [BSI] it is possible to highlight multiple layers of chat EXT-3844 Mouse wheel camera zoom is not reflected on View popup slider EXT-3103 Add an option to restrict entering non-ascii symbols in text editor. reviewed by Leyla
2009-11-17EXT-2403 Object name, description now forced to be ASCII characters onlyJames Cook
Also fixes EXT-172, EXT-2399. Semantics now are: Object name, object desc, parcel name, region name, inventory item name all are ASCII only. Parcel desc allows arbitrary Unicode chars. Group names force ASCII only. Reviewed with Leyla
2009-11-04Redo Bao's broken mergeBryan O'Sullivan
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-02-03QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergemeAdam Moss
svn merge -r108355:109316 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/maint-viewer-12-uploadfees-qa108314 Whew.
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-08-12QAR-767 Combined maint-render-7 and maint-viewer-9 mergeSteven Bennetts
merge release@93398 viewer-merge-1@94007 -> release dataserver-is-deprecated
2008-06-26QAR-628 merge string-cleanup-5 -r 90476:90508 -> releaseSteven Bennetts
dataserver-is-deprecated
2008-04-01merge release@83343 skinning-1-merge@83714 -> releaseSteven Bennetts
QAR-424
2008-02-19merge 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-04EFFECTIVE MERGE: maint-ui-qa3 -r 73391:74133 -> releaseSteven Bennetts
ACTUAL MERGE: merge release@74893 maint-ui-3-merge@74902 -> release
2007-12-03-74901 (back out premature commit to release)Steven Bennetts
2007-12-03merge -r 73391:74133 maint-ui-3 -> releaseSteven Bennetts
2007-10-04Result 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-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-05-02svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into ↵Don Kjer
release
2007-02-02Result of svn merge -r57264:57370 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release.
2007-01-02Print done when done.James Cook