summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaternamedesc.cpp
AgeCommit message (Collapse)Author
2018-02-26Added settings inventory object with subtypeRider Linden
2016-08-30Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2016-05-19Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2016-04-13MAINT-3286 FIXED Fix error message on snapshot save when user has no L$andreykproductengine
2016-04-04merge with 4.0.3-releaseOz Linden
2015-11-10remove execute permission from many files that should not have itOz Linden
2015-07-20Forgot to remove an unused varable and renamed NewFileResourceUploadInfo to ↵Rider Linden
LLNewFileResourceUploadInfo
2015-07-15LSL Script upload from inventory.Rider Linden
2015-07-10MAINT-5356: Conversion of Notecards and Gesture to use new coroutine uploading.Rider Linden
Minor reorganization of Upload Info classes.
2015-07-02Crash on second add to coproc queue.Rider Linden
2015-05-28MAINT-5232: Normalize LLGlobalEconomy's use of LLSingleton.Nat Goodspeed
LLSingleton currently presents two different usage styles: deriving MyClass from LLSingleton<MyClass>, or just using a typedef. Turns out LLGlobalEconomy is the ONLY class using the typedef style -- and the apologetic comment talks about a potential maintenance that hasn't actually happened. Derive LLGlobalEconomy from LLSingleton<LLGlobalEconomy>, like everyone else.
2014-10-18Update to build on Xcode 6.0: remove lots of unused variablescallum_linden
2013-11-19merge up to 3.6.10-release; some of the storm-68 changes lostOz Linden
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2012-06-09STORM-68 Fiddling with debugging for New Script caseJonathan Yap
2012-06-09STORM-68 Removed debugging PERM_ALL that was causing upload trouble and ↵Jonathan Yap
removed 3 obsolete debug settings
2012-06-08STORM-68 As a Builder, I want that ability to set default permissions on ↵Jonathan Yap
creation of objects, clothing, scripts, notecards, etc. First pass at implementation, debuggins lines still need to be removed and there is one known bug to be resolved.
2012-01-29STORM-1803 Adding raw anim file upload supportJonathan Yap
2011-11-18Fixes .lsl not being appended if no extension is provided.Ima Mechanique
2011-11-17STORM-1708 Adding ability to save/load scripts from file.Ima Mechanique
2010-08-24Backed out changeset c3d41f18ce2bTofu Linden
back-out the back-out for this branch. yay.
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-06-15Backed out changeset 1c66b34b7fbeTofu 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 05:25:52 +0000