livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
phoenix-firestorm/indra/newview
History
Kyle Ambroff 095aca3eae svn merge -r98039:98711 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-24-Server --> release 
Merging various security fixes from Branch_1-24-Server.

Related to RequestXfer exploit:
* DEV-21706 (SEC-188): llParticleSystem can be used to obtain asset id.
* DEV-21767: Migrate RequestXfer to TCP-only
* DEV-21765: Fix RequestXfer traversal exploit
* DEV-21775: LLXferManager::processFileRequest() still has file vulnerabilities

Various fixes:
* fix for VFS memory corruption in llvfs.
* Bump server version to 1.24.9.

Landstore fixes:
* Passing locale to fulfill-order-item from region reservation fulfillment.
 		2008-10-07 20:50:30 +00:00
..
English.lproj svn merge -r96886:98039 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-24-Server --> release 2008-10-01 00:42:47 +00:00
German.lproj svn merge -r 59364:59813 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release 2007-03-31 01:41:19 +00:00
Japanese.lproj svn merge -r 59364:59813 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release 2007-03-31 01:41:19 +00:00
Korean.lproj svn merge -r 59364:59813 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release 2007-03-31 01:41:19 +00:00
SecondLife.nib Print done when done. 2007-01-02 08:33:20 +00:00
app_settings QAR-872 Viewer 1.21 RC 3 2008-09-29 19:14:50 +00:00
cursors_mac svn merge -r 79730:79944 svn+ssh://svn.lindenlab.com/svn/linden/branches/parcel_media/sl-parcelmedia-6 --> release 2008-02-14 01:45:59 +00:00
installers QAR-872 Viewer 1.21 RC 3 2008-09-29 19:14:50 +00:00
linux_tools merge support-featurettes-snapshot-merge-2 for QAR-754, includes: 2008-07-18 17:50:25 +00:00
res svn merge -r96886:98039 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-24-Server --> release 2008-10-01 00:42:47 +00:00
skins QAR-872 Viewer 1.21 RC 3 2008-09-29 19:14:50 +00:00
CMakeLists.txt QAR-849 merge maint-viewer-10-merge 96838-97237 -> release 2008-09-23 01:53:11 +00:00
Info-SecondLife.plist svn merge -r96886:98039 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-24-Server --> release 2008-10-01 00:42:47 +00:00
Info-SecondLifeVorbis.plist Print done when done. 2007-01-02 08:33:20 +00:00
VertexCache.h Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
ViewerInstall.cmake svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge 2008-06-02 21:14:31 +00:00
VorbisFramework.h Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
featuretable.txt QAR-872 Viewer 1.21 RC 3 2008-09-29 19:14:50 +00:00
featuretable_linux.txt QAR-767 Combined maint-render-7 and maint-viewer-9 merge 2008-08-12 17:29:50 +00:00
featuretable_mac.txt merge viewer/viewer_1-21 94170-94770 -> release 2008-08-28 23:57:41 +00:00
featuretable_solaris.txt merge release@82858 maint-render-2-merge@83010 -> release 2008-03-25 22:50:26 +00:00
fmod_hidden_symbols.exp svn merge -r 59178:59364 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release 2007-03-21 19:36:11 +00:00
fmodwrapper.cpp Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
gpu_table.txt QAR-872 Viewer 1.21 RC 3 2008-09-29 19:14:50 +00:00
licenses-linux.txt Merge of windlight into release (QAR-286). This includes all changes in 2008-02-27 18:58:14 +00:00
licenses-mac.txt Merge of windlight into release (QAR-286). This includes all changes in 2008-02-27 18:58:14 +00:00
licenses-solaris.txt Merge of windlight into release (QAR-286). This includes all changes in 2008-02-27 18:58:14 +00:00
licenses-win32.txt Merge of windlight into release (QAR-286). This includes all changes in 2008-02-27 18:58:14 +00:00
llagent.cpp QAR-849 merge maint-viewer-10-merge 96838-97237 -> release 2008-09-23 01:53:11 +00:00
llagent.h merge viewer/viewer_1-21 94170-94770 -> release 2008-08-28 23:57:41 +00:00
llagentdata.cpp Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
llagentdata.h Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
llagentlanguage.cpp EFFECTIVE MERGES: 2008-05-19 17:02:33 +00:00
llagentlanguage.h EFFECTIVE MERGES: 2008-05-19 17:02:33 +00:00
llagentpilot.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llagentpilot.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llanimstatelabels.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llanimstatelabels.h svn merge -r 86190:86191 maint-ui-11-merge (EFFECTIVE MERGE: -r 84579:85724 maint-ui-11-qa). 2008-04-30 23:30:09 +00:00
llappearance.h merge Branch_1-19-1-Viewer -r 80930 : 81609 -> release 2008-03-11 01:47:36 +00:00
llappviewer.cpp QAR-872 Viewer 1.21 RC 3 2008-09-29 19:14:50 +00:00
llappviewer.h QAR-872 Viewer 1.21 RC 3 2008-09-29 19:14:50 +00:00
llappviewerlinux.cpp QAR-849 merge maint-viewer-10-merge 96838-97237 -> release 2008-09-23 01:53:11 +00:00
llappviewerlinux.h QAR-849 merge maint-viewer-10-merge 96838-97237 -> release 2008-09-23 01:53:11 +00:00
llappviewerlinux_api.h QAR-849 merge maint-viewer-10-merge 96838-97237 -> release 2008-09-23 01:53:11 +00:00
llappviewerlinux_api.xml QAR-849 merge maint-viewer-10-merge 96838-97237 -> release 2008-09-23 01:53:11 +00:00
llappviewerlinux_api_dbus.cpp QAR-849 merge maint-viewer-10-merge 96838-97237 -> release 2008-09-23 01:53:11 +00:00
llappviewerlinux_api_dbus.h QAR-849 merge maint-viewer-10-merge 96838-97237 -> release 2008-09-23 01:53:11 +00:00
llappviewerlinux_api_dbus_syms_raw.inc QAR-849 merge maint-viewer-10-merge 96838-97237 -> release 2008-09-23 01:53:11 +00:00
llappviewermacosx.cpp merge viewer/viewer_1-21 94170-94770 -> release 2008-08-28 23:57:41 +00:00
llappviewermacosx.h QAR-449 Viewer 1.20 RC 0 2008-04-17 02:42:27 +00:00
llappviewerwin32.cpp QAR-849 merge maint-viewer-10-merge 96838-97237 -> release 2008-09-23 01:53:11 +00:00
llappviewerwin32.h QAR-849 merge maint-viewer-10-merge 96838-97237 -> release 2008-09-23 01:53:11 +00:00
llassetuploadqueue.cpp svn merge -r 93885:94413 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-24-Server --> release 2008-08-14 22:06:38 +00:00
llassetuploadqueue.h svn merge -r93014:93396 svn+ssh://svn.lindenlab.com/svn/linden/branches/mono-r93014-qar633 dataserver-is-deprecated 2008-07-31 12:15:15 +00:00
llassetuploadresponders.cpp svn merge -r93014:93396 svn+ssh://svn.lindenlab.com/svn/linden/branches/mono-r93014-qar633 dataserver-is-deprecated 2008-07-31 12:15:15 +00:00
llassetuploadresponders.h svn merge -r93014:93396 svn+ssh://svn.lindenlab.com/svn/linden/branches/mono-r93014-qar633 dataserver-is-deprecated 2008-07-31 12:15:15 +00:00
llaudiosourcevo.cpp QAR-849 merge maint-viewer-10-merge 96838-97237 -> release 2008-09-23 01:53:11 +00:00
llaudiosourcevo.h Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
llbox.cpp QAR-650 - Viewer RC 9 merge -> release (post cmake) 2008-06-06 22:43:38 +00:00
llbox.h Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
llcallbacklist.cpp Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
llcallbacklist.h Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
llcallingcard.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llcallingcard.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llcaphttpsender.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llcaphttpsender.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llchatbar.cpp QAR-872 Viewer 1.21 RC 3 2008-09-29 19:14:50 +00:00
llchatbar.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llclassifiedinfo.cpp merge svn+ssh://steve@svn/svn/linden/branches/viewer-cleanup-3 -r 73026:73079 2007-11-07 22:55:27 +00:00
llclassifiedinfo.h Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
llclassifiedstatsresponder.cpp merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986 : 80178 -> release. 2008-02-19 21:42:32 +00:00
llclassifiedstatsresponder.h merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986 : 80178 -> release. 2008-02-19 21:42:32 +00:00
llcloud.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llcloud.h Merge of windlight into release (QAR-286). This includes all changes in 2008-02-27 18:58:14 +00:00
llcolorswatch.cpp QAR-767 Combined maint-render-7 and maint-viewer-9 merge 2008-08-12 17:29:50 +00:00
llcolorswatch.h merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llcommandhandler.cpp merge Branch_1-19-0-Viewer -r 78432:78989 -> release 2008-02-01 22:10:40 +00:00
llcommandhandler.h merge Branch_1-19-0-Viewer -r 78432:78989 -> release 2008-02-01 22:10:40 +00:00
llcommandlineparser.cpp QAR-849 merge maint-viewer-10-merge 96838-97237 -> release 2008-09-23 01:53:11 +00:00
llcommandlineparser.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llcompilequeue.cpp svn merge -r 93885:94413 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-24-Server --> release 2008-08-14 22:06:38 +00:00
llcompilequeue.h svn merge -r93014:93396 svn+ssh://svn.lindenlab.com/svn/linden/branches/mono-r93014-qar633 dataserver-is-deprecated 2008-07-31 12:15:15 +00:00
llconfirmationmanager.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llconfirmationmanager.h Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
llcurrencyuimanager.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llcurrencyuimanager.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llcylinder.cpp merge release-QAR-499 Viewer 1.20 RC 3 2008-04-28 23:29:46 +00:00
llcylinder.h Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
lldebugmessagebox.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
lldebugmessagebox.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
lldebugview.cpp merge support-featurettes-snapshot-merge-2 for QAR-754, includes: 2008-07-18 17:50:25 +00:00
lldebugview.h merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
lldelayedgestureerror.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
lldelayedgestureerror.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
lldirpicker.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
lldirpicker.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
lldrawable.cpp QAR-767 Combined maint-render-7 and maint-viewer-9 merge 2008-08-12 17:29:50 +00:00
lldrawable.h QAR-767 Combined maint-render-7 and maint-viewer-9 merge 2008-08-12 17:29:50 +00:00
lldrawpool.cpp QAR-650 - Viewer RC 9 merge -> release (post cmake) 2008-06-06 22:43:38 +00:00
lldrawpool.h merge release-QAR-499 Viewer 1.20 RC 3 2008-04-28 23:29:46 +00:00
lldrawpoolalpha.cpp Merging in file-move-merge ( QAR-649 ) 2008-06-30 17:57:00 +00:00
lldrawpoolalpha.h QAR-566 maint-viewer-5-merge-2 2008-05-11 20:56:42 +00:00
lldrawpoolavatar.cpp QAR-872 Viewer 1.21 RC 3 2008-09-29 19:14:50 +00:00
lldrawpoolavatar.h Merge of windlight into release (QAR-286). This includes all changes in 2008-02-27 18:58:14 +00:00
lldrawpoolbump.cpp merge viewer/viewer_1-21 94170-94770 -> release 2008-08-28 23:57:41 +00:00
lldrawpoolbump.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
lldrawpoolclouds.cpp Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
lldrawpoolclouds.h Merge of windlight into release (QAR-286). This includes all changes in 2008-02-27 18:58:14 +00:00
lldrawpoolground.cpp Merging in file-move-merge ( QAR-649 ) 2008-06-30 17:57:00 +00:00
lldrawpoolground.h Merge of windlight into release (QAR-286). This includes all changes in 2008-02-27 18:58:14 +00:00
lldrawpoolsimple.cpp Merging in file-move-merge ( QAR-649 ) 2008-06-30 17:57:00 +00:00
lldrawpoolsimple.h Merge of windlight into release (QAR-286). This includes all changes in 2008-02-27 18:58:14 +00:00
lldrawpoolsky.cpp Merging in file-move-merge ( QAR-649 ) 2008-06-30 17:57:00 +00:00
lldrawpoolsky.h Merge of windlight into release (QAR-286). This includes all changes in 2008-02-27 18:58:14 +00:00
lldrawpoolterrain.cpp Merging in file-move-merge ( QAR-649 ) 2008-06-30 17:57:00 +00:00
lldrawpoolterrain.h Merge of windlight into release (QAR-286). This includes all changes in 2008-02-27 18:58:14 +00:00
lldrawpooltree.cpp Merging in file-move-merge ( QAR-649 ) 2008-06-30 17:57:00 +00:00
lldrawpooltree.h Merge of windlight into release (QAR-286). This includes all changes in 2008-02-27 18:58:14 +00:00
lldrawpoolwater.cpp Merging in file-move-merge ( QAR-649 ) 2008-06-30 17:57:00 +00:00
lldrawpoolwater.h merge release@82858 maint-render-2-merge@83010 -> release 2008-03-25 22:50:26 +00:00
lldrawpoolwlsky.cpp QAR-767 Combined maint-render-7 and maint-viewer-9 merge 2008-08-12 17:29:50 +00:00
lldrawpoolwlsky.h Merge of windlight into release (QAR-286). This includes all changes in 2008-02-27 18:58:14 +00:00
lldriverparam.cpp QAR-669 1.20 Viewer RC11 2008-06-27 21:02:01 +00:00
lldriverparam.h QAR-669 1.20 Viewer RC11 2008-06-27 21:02:01 +00:00
lldynamictexture.cpp QAR-872 Viewer 1.21 RC 3 2008-09-29 19:14:50 +00:00
lldynamictexture.h merge Branch_1-19-1-Viewer -r 80930 : 81609 -> release 2008-03-11 01:47:36 +00:00
llemote.cpp Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
llemote.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
lleventinfo.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
lleventinfo.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
lleventnotifier.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
lleventnotifier.h svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge 2008-06-02 21:14:31 +00:00
lleventpoll.cpp merge -r94900 linden/branches/kelly/qar-825 to linden/release 2008-08-26 17:15:20 +00:00
lleventpoll.h Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
llface.cpp QAR-872 Viewer 1.21 RC 3 2008-09-29 19:14:50 +00:00
llface.h svn merge -r92720:92721 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-merge 2008-07-23 21:20:19 +00:00
llface.inl Merge of windlight into release (QAR-286). This includes all changes in 2008-02-27 18:58:14 +00:00
llfasttimerview.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llfasttimerview.h merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llfeaturemanager.cpp QAR-767 Combined maint-render-7 and maint-viewer-9 merge 2008-08-12 17:29:50 +00:00
llfeaturemanager.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llfilepicker.cpp QAR-849 merge maint-viewer-10-merge 96838-97237 -> release 2008-09-23 01:53:11 +00:00
llfilepicker.h merge support-featurettes-snapshot-merge-2 for QAR-754, includes: 2008-07-18 17:50:25 +00:00
llfirstuse.cpp QAR-782 Merge featurettes batch #2 2008-08-13 19:37:05 +00:00
llfirstuse.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llflexibleobject.cpp QAR-650 - Viewer RC 9 merge -> release (post cmake) 2008-06-06 22:43:38 +00:00
llflexibleobject.h merge release-QAR-499 Viewer 1.20 RC 3 2008-04-28 23:29:46 +00:00
llfloaterabout.cpp QAR-872 Viewer 1.21 RC 3 2008-09-29 19:14:50 +00:00
llfloaterabout.h Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
llfloateranimpreview.cpp QAR-767 Combined maint-render-7 and maint-viewer-9 merge 2008-08-12 17:29:50 +00:00
llfloateranimpreview.h QAR-669 1.20 Viewer RC11 2008-06-27 21:02:01 +00:00
llfloaterauction.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llfloaterauction.h merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986 : 80178 -> release. 2008-02-19 21:42:32 +00:00
llfloateravatarpicker.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llfloateravatarpicker.h merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llfloateravatartextures.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llfloateravatartextures.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llfloaterbuildoptions.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llfloaterbuildoptions.h Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
llfloaterbump.cpp QAR-872 Viewer 1.21 RC 3 2008-09-29 19:14:50 +00:00
llfloaterbump.h Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
llfloaterbuy.cpp QAR-782 Merge featurettes batch #2 2008-08-13 19:37:05 +00:00
llfloaterbuy.h QAR-782 Merge featurettes batch #2 2008-08-13 19:37:05 +00:00
llfloaterbuycontents.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llfloaterbuycontents.h merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986 : 80178 -> release. 2008-02-19 21:42:32 +00:00
llfloaterbuycurrency.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llfloaterbuycurrency.h Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
llfloaterbuyland.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llfloaterbuyland.h merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986 : 80178 -> release. 2008-02-19 21:42:32 +00:00
llfloatercamera.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llfloatercamera.h QAR-449 Viewer 1.20 RC 0 2008-04-17 02:42:27 +00:00
llfloaterchat.cpp QAR-782 Merge featurettes batch #2 2008-08-13 19:37:05 +00:00
llfloaterchat.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llfloaterchatterbox.cpp merge release-QAR-499 Viewer 1.20 RC 2 (additional changes) 2008-04-28 22:19:05 +00:00
llfloaterchatterbox.h merge release-QAR-499 Viewer 1.20 RC 2 (additional changes) 2008-04-28 22:19:05 +00:00
llfloatercolorpicker.cpp QAR-767 Combined maint-render-7 and maint-viewer-9 merge 2008-08-12 17:29:50 +00:00
llfloatercolorpicker.h Merge of windlight into release (QAR-286). This includes all changes in 2008-02-27 18:58:14 +00:00
llfloaterdaycycle.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llfloaterdaycycle.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llfloaterenvsettings.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llfloaterenvsettings.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llfloaterevent.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llfloaterevent.h DEV-9328 DEV-9330 DEV-9334 Fixed license information in source files to match the wiki [[License Substition]] standard. Commit to release OK by Josh/Jwolk. 2008-01-24 20:26:50 +00:00
llfloaterfriends.cpp QAR-855 Viewer 1.21 RC 2 2008-09-12 06:27:13 +00:00
llfloaterfriends.h QAR-855 Viewer 1.21 RC 2 2008-09-12 06:27:13 +00:00
llfloatergesture.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llfloatergesture.h Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
llfloatergodtools.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llfloatergodtools.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llfloatergroupinvite.cpp EFFECTIVE MERGES: 2008-05-19 17:02:33 +00:00
llfloatergroupinvite.h Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
llfloatergroups.cpp QAR-669 1.20 Viewer RC11 2008-06-27 21:02:01 +00:00
llfloatergroups.h merge release@82383 viewer-cleanup2-7-merge@82828 2008-03-20 21:41:26 +00:00
llfloaterhardwaresettings.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llfloaterhardwaresettings.h merge release@82858 maint-render-2-merge@83010 -> release 2008-03-25 22:50:26 +00:00
llfloaterhud.cpp merge viewer/viewer_1-21 94170-94770 -> release 2008-08-28 23:57:41 +00:00
llfloaterhud.h merge viewer/viewer_1-21 94170-94770 -> release 2008-08-28 23:57:41 +00:00
llfloaterimagepreview.cpp QAR-849 merge maint-viewer-10-merge 96838-97237 -> release 2008-09-23 01:53:11 +00:00
llfloaterimagepreview.h QAR-849 merge maint-viewer-10-merge 96838-97237 -> release 2008-09-23 01:53:11 +00:00
llfloaterinspect.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llfloaterinspect.h merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986 : 80178 -> release. 2008-02-19 21:42:32 +00:00
llfloaterjoystick.cpp QAR-872 Viewer 1.21 RC 3 2008-09-29 19:14:50 +00:00
llfloaterjoystick.h QAR-427 2008-04-04 01:22:03 +00:00
llfloaterlagmeter.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llfloaterlagmeter.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llfloaterland.cpp QAR-872 Viewer 1.21 RC 3 2008-09-29 19:14:50 +00:00
llfloaterland.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llfloaterlandholdings.cpp QAR-872 Viewer 1.21 RC 3 2008-09-29 19:14:50 +00:00
llfloaterlandholdings.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llfloatermap.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llfloatermap.h svn merge -r 72652:72881 svn+ssh://svn.lindenlab.com/svn/linden/branches/sl-search-11 --> release 2007-11-01 22:02:35 +00:00
llfloatermemleak.cpp QAR-767 Combined maint-render-7 and maint-viewer-9 merge 2008-08-12 17:29:50 +00:00
llfloatermemleak.h QAR-767 Combined maint-render-7 and maint-viewer-9 merge 2008-08-12 17:29:50 +00:00
llfloaternamedesc.cpp QAR-767 Combined maint-render-7 and maint-viewer-9 merge 2008-08-12 17:29:50 +00:00
llfloaternamedesc.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llfloateropenobject.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llfloateropenobject.h merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986 : 80178 -> release. 2008-02-19 21:42:32 +00:00
llfloaterparcel.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llfloaterparcel.h DEV-9328 DEV-9330 DEV-9334 Fixed license information in source files to match the wiki [[License Substition]] standard. Commit to release OK by Josh/Jwolk. 2008-01-24 20:26:50 +00:00
llfloaterpostcard.cpp QAR-782 Merge featurettes batch #2 2008-08-13 19:37:05 +00:00
llfloaterpostcard.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llfloaterpostprocess.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llfloaterpostprocess.h Merge of windlight into release (QAR-286). This includes all changes in 2008-02-27 18:58:14 +00:00
llfloaterpreference.cpp QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
llfloaterpreference.h QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
llfloaterproperties.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llfloaterproperties.h QAR-537 Viewer 1.20 RC 6 2008-05-09 20:57:23 +00:00
llfloaterregioninfo.cpp svn merge -r98039:98711 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-24-Server --> release 2008-10-07 20:50:30 +00:00
llfloaterregioninfo.h merge viewer/viewer_1-21 94170-94770 -> release 2008-08-28 23:57:41 +00:00
llfloaterreporter.cpp QAR-872 Viewer 1.21 RC 3 2008-09-29 19:14:50 +00:00
llfloaterreporter.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llfloaterscriptdebug.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llfloaterscriptdebug.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llfloatersellland.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llfloatersellland.h merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986 : 80178 -> release. 2008-02-19 21:42:32 +00:00
llfloatersettingsdebug.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llfloatersettingsdebug.h merge release@82383 viewer-cleanup2-7-merge@82828 2008-03-20 21:41:26 +00:00
llfloatersnapshot.cpp QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
llfloatersnapshot.h QAR-782 Merge featurettes batch #2 2008-08-13 19:37:05 +00:00
llfloatertelehub.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llfloatertelehub.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llfloatertools.cpp merge viewer/viewer_1-21 94170-94770 -> release 2008-08-28 23:57:41 +00:00
llfloatertools.h merge support-featurettes-snapshot-merge-2 for QAR-754, includes: 2008-07-18 17:50:25 +00:00
llfloatertopobjects.cpp QAR-855 Viewer 1.21 RC 2 2008-09-12 06:27:13 +00:00
llfloatertopobjects.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llfloatertos.cpp QAR-782 Merge featurettes batch #2 2008-08-13 19:37:05 +00:00
llfloatertos.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llfloaterurldisplay.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llfloaterurldisplay.h merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986 : 80178 -> release. 2008-02-19 21:42:32 +00:00
llfloaterurlentry.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llfloaterurlentry.h Updated header comments with our public license statement that reflects their public nature. DEV-10766 2008-02-21 21:25:17 +00:00
llfloatervoicedevicesettings.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llfloatervoicedevicesettings.h svn merge -r 83778:83944 maint-ui-10-merge 2008-04-03 18:43:54 +00:00
llfloaterwater.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llfloaterwater.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llfloaterwindlight.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llfloaterwindlight.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llfloaterworldmap.cpp QAR-782 Merge featurettes batch #2 2008-08-13 19:37:05 +00:00
llfloaterworldmap.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llfolderview.cpp QAR-872 Viewer 1.21 RC 3 2008-09-29 19:14:50 +00:00
llfolderview.h QAR-872 Viewer 1.21 RC 3 2008-09-29 19:14:50 +00:00
llfollowcam.cpp EFFECTIVE MERGES: 2008-05-19 17:02:33 +00:00
llfollowcam.h EFFECTIVE MERGES: 2008-05-19 17:02:33 +00:00
llgesturemgr.cpp QAR-872 Viewer 1.21 RC 3 2008-09-29 19:14:50 +00:00
llgesturemgr.h Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
llglsandbox.cpp QAR-855 Viewer 1.21 RC 2 2008-09-12 06:27:13 +00:00
llgroupmgr.cpp QAR-849 merge maint-viewer-10-merge 96838-97237 -> release 2008-09-23 01:53:11 +00:00
llgroupmgr.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llhomelocationresponder.cpp svn merge -r95288:95907 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/qar-841 2008-09-05 22:03:35 +00:00
llhomelocationresponder.h svn merge -r95288:95907 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/qar-841 2008-09-05 22:03:35 +00:00
llhudeffect.cpp svn merge -r83872:83893 linden/branches/Branch_1-20-0-Server to linden/release 2008-04-03 22:50:22 +00:00
llhudeffect.h Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
llhudeffectbeam.cpp svn merge -r83872:83893 linden/branches/Branch_1-20-0-Server to linden/release 2008-04-03 22:50:22 +00:00
llhudeffectbeam.h Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
llhudeffectlookat.cpp QAR-669 1.20 Viewer RC11 2008-06-27 21:02:01 +00:00
llhudeffectlookat.h QAR-488 Viewer 1.20 RC 2 2008-04-23 01:04:01 +00:00
llhudeffectpointat.cpp QAR-669 1.20 Viewer RC11 2008-06-27 21:02:01 +00:00
llhudeffectpointat.h QAR-488 Viewer 1.20 RC 2 2008-04-23 01:04:01 +00:00
llhudeffecttrail.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llhudeffecttrail.h Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
llhudicon.cpp QAR-650 - Viewer RC 9 merge -> release (post cmake) 2008-06-06 22:43:38 +00:00
llhudicon.h Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
llhudmanager.cpp QAR-449 Viewer 1.20 RC 1 2008-04-17 02:56:14 +00:00
llhudmanager.h QAR-449 Viewer 1.20 RC 1 2008-04-17 02:56:14 +00:00
llhudobject.cpp QAR-537 Viewer 1.20 RC 6 2008-05-09 20:57:23 +00:00
llhudobject.h svn merge -r92720:92721 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-merge 2008-07-23 21:20:19 +00:00
llhudrender.cpp Merging in file-move-merge ( QAR-649 ) 2008-06-30 17:57:00 +00:00
llhudrender.h Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
llhudtext.cpp QAR-767 Combined maint-render-7 and maint-viewer-9 merge 2008-08-12 17:29:50 +00:00
llhudtext.h QAR-767 Combined maint-render-7 and maint-viewer-9 merge 2008-08-12 17:29:50 +00:00
llhudview.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llhudview.h merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llimpanel.cpp QAR-872 Viewer 1.21 RC 3 2008-09-29 19:14:50 +00:00
llimpanel.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llimview.cpp QAR-872 Viewer 1.21 RC 3 2008-09-29 19:14:50 +00:00
llimview.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llinventorybridge.cpp QAR-669 1.20 Viewer RC11 2008-06-27 21:02:01 +00:00
llinventorybridge.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llinventoryclipboard.cpp Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
llinventoryclipboard.h Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
llinventorymodel.cpp QAR-751 : Merge Agent Inventory Services - Fetch Inventory and Fetch Inventory Descendents - to Release 2008-09-16 18:12:32 +00:00
llinventorymodel.h QAR-751 : Merge Agent Inventory Services - Fetch Inventory and Fetch Inventory Descendents - to Release 2008-09-16 18:12:32 +00:00
lljoystickbutton.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
lljoystickbutton.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
lllandmarklist.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
lllandmarklist.h Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
lllightconstants.h Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
lllogchat.cpp QAR-872 Viewer 1.21 RC 3 2008-09-29 19:14:50 +00:00
lllogchat.h QAR-767 Combined maint-render-7 and maint-viewer-9 merge 2008-08-12 17:29:50 +00:00
llmanip.cpp svn merge -r92720:92721 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-merge 2008-07-23 21:20:19 +00:00
llmanip.h svn merge -r92720:92721 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-merge 2008-07-23 21:20:19 +00:00
llmaniprotate.cpp QAR-767 Combined maint-render-7 and maint-viewer-9 merge 2008-08-12 17:29:50 +00:00
llmaniprotate.h svn merge -r92720:92721 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-merge 2008-07-23 21:20:19 +00:00
llmanipscale.cpp QAR-767 Combined maint-render-7 and maint-viewer-9 merge 2008-08-12 17:29:50 +00:00
llmanipscale.h svn merge -r92720:92721 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-merge 2008-07-23 21:20:19 +00:00
llmaniptranslate.cpp QAR-767 Combined maint-render-7 and maint-viewer-9 merge 2008-08-12 17:29:50 +00:00
llmaniptranslate.h svn merge -r92720:92721 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-merge 2008-07-23 21:20:19 +00:00
llmemoryview.cpp QAR-767 Combined maint-render-7 and maint-viewer-9 merge 2008-08-12 17:29:50 +00:00
llmemoryview.h merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llmenucommands.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llmenucommands.h Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
llmimetypes.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llmimetypes.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llmorphview.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llmorphview.h merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llmoveview.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llmoveview.h QAR-449 Viewer 1.20 RC 0 2008-04-17 02:42:27 +00:00
llmutelist.cpp QAR-849 merge maint-viewer-10-merge 96838-97237 -> release 2008-09-23 01:53:11 +00:00
llmutelist.h QAR-849 merge maint-viewer-10-merge 96838-97237 -> release 2008-09-23 01:53:11 +00:00
llnamebox.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llnamebox.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llnameeditor.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llnameeditor.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llnamelistctrl.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llnamelistctrl.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llnetmap.cpp QAR-849 merge maint-viewer-10-merge 96838-97237 -> release 2008-09-23 01:53:11 +00:00
llnetmap.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
lloverlaybar.cpp QAR-782 Merge featurettes batch #2 2008-08-13 19:37:05 +00:00
lloverlaybar.h QAR-782 Merge featurettes batch #2 2008-08-13 19:37:05 +00:00
llpanelavatar.cpp QAR-782 Merge featurettes batch #2 2008-08-13 19:37:05 +00:00
llpanelavatar.h QAR-782 Merge featurettes batch #2 2008-08-13 19:37:05 +00:00
llpanelclassified.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llpanelclassified.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llpanelcontents.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llpanelcontents.h Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
llpanelface.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llpanelface.h Merge of windlight into release (QAR-286). This includes all changes in 2008-02-27 18:58:14 +00:00
llpanelgroup.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llpanelgroup.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llpanelgroupgeneral.cpp QAR-872 Viewer 1.21 RC 3 2008-09-29 19:14:50 +00:00
llpanelgroupgeneral.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llpanelgroupinvite.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llpanelgroupinvite.h Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
llpanelgrouplandmoney.cpp QAR-872 Viewer 1.21 RC 3 2008-09-29 19:14:50 +00:00
llpanelgrouplandmoney.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llpanelgroupnotices.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llpanelgroupnotices.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llpanelgrouproles.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llpanelgrouproles.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llpanelland.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llpanelland.h Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
llpanellandmedia.cpp svn merge -r 90938:92097 svn+ssh://svn.lindenlab.com/svn/linden/branches/qar-730/qar-730-merge -> release. This is for QAR-730: Combination merge of QAR-432 and QAR-601 2008-07-15 00:41:08 +00:00
llpanellandmedia.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llpanellogin.cpp QAR-855 Viewer 1.21 RC 2 2008-09-12 06:27:13 +00:00
llpanellogin.h QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
llpanelobject.cpp QAR-782 Merge featurettes batch #2 2008-08-13 19:37:05 +00:00
llpanelobject.h QAR-782 Merge featurettes batch #2 2008-08-13 19:37:05 +00:00
llpanelpermissions.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llpanelpermissions.h Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
llpanelpick.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llpanelpick.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llpanelplace.cpp QAR-872 Viewer 1.21 RC 3 2008-09-29 19:14:50 +00:00
llpanelplace.h svn merge -r87877:87878 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-ui/maint-ui-12-qa-5 which is the last iteration of the maint-ui series of branches. Future work will be in featurettes. 2008-05-20 23:24:16 +00:00
llpanelvolume.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llpanelvolume.h Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
llparcelselection.cpp Updated header comments with our public license statement that reflects their public nature. DEV-10766 2008-02-21 21:25:17 +00:00
llparcelselection.h Updated header comments with our public license statement that reflects their public nature. DEV-10766 2008-02-21 21:25:17 +00:00
llpatchvertexarray.cpp Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
llpatchvertexarray.h Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
llpolymesh.cpp QAR-767 Combined maint-render-7 and maint-viewer-9 merge 2008-08-12 17:29:50 +00:00
llpolymesh.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llpolymorph.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llpolymorph.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llpreview.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llpreview.h 1.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426 2008-04-03 19:21:14 +00:00
llpreviewanim.cpp QAR-669 1.20 Viewer RC11 2008-06-27 21:02:01 +00:00
llpreviewanim.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llpreviewgesture.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llpreviewgesture.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llpreviewnotecard.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llpreviewnotecard.h merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llpreviewscript.cpp svn merge -r 93885:94413 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-24-Server --> release 2008-08-14 22:06:38 +00:00
llpreviewscript.h svn merge -r93014:93396 svn+ssh://svn.lindenlab.com/svn/linden/branches/mono-r93014-qar633 dataserver-is-deprecated 2008-07-31 12:15:15 +00:00
llpreviewsound.cpp QAR-849 merge maint-viewer-10-merge 96838-97237 -> release 2008-09-23 01:53:11 +00:00
llpreviewsound.h EFFECTIVE MERGE: svn merge -r 71520:73420 svn+ssh://svn/svn/linden/branches/maintenance-3 into release 2007-12-05 23:43:56 +00:00
llpreviewtexture.cpp QAR-767 Combined maint-render-7 and maint-viewer-9 merge 2008-08-12 17:29:50 +00:00
llpreviewtexture.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llprogressview.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llprogressview.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llregionposition.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llregionposition.h Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
llremoteparcelrequest.cpp merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986 : 80178 -> release. 2008-02-19 21:42:32 +00:00
llremoteparcelrequest.h merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986 : 80178 -> release. 2008-02-19 21:42:32 +00:00
llresourcedata.h Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
llsavedsettingsglue.cpp Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
llsavedsettingsglue.h Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
llselectmgr.cpp QAR-872 Viewer 1.21 RC 3 2008-09-29 19:14:50 +00:00
llselectmgr.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llsky.cpp Merge of windlight into release (QAR-286). This includes all changes in 2008-02-27 18:58:14 +00:00
llsky.h QAR-855 Viewer 1.21 RC 2 2008-09-12 06:27:13 +00:00
llspatialpartition.cpp QAR-855 Viewer 1.21 RC 2 2008-09-12 06:27:13 +00:00
llspatialpartition.h svn merge -r92720:92721 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-merge 2008-07-23 21:20:19 +00:00
llsprite.cpp svn merge -r95288:95907 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/qar-841 2008-09-05 22:03:35 +00:00
llsprite.h svn merge -r95288:95907 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/qar-841 2008-09-05 22:03:35 +00:00
llsrv.cpp svn merge -r 71509:72877 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-4-Viewer --> release 2007-11-01 23:10:05 +00:00
llsrv.h Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
llstartup.cpp svn merge -r96886:98039 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-24-Server --> release 2008-10-01 00:42:47 +00:00
llstartup.h QAR-767 Combined maint-render-7 and maint-viewer-9 merge 2008-08-12 17:29:50 +00:00
llstatusbar.cpp svn merge -r 90938:92097 svn+ssh://svn.lindenlab.com/svn/linden/branches/qar-730/qar-730-merge -> release. This is for QAR-730: Combination merge of QAR-432 and QAR-601 2008-07-15 00:41:08 +00:00
llstatusbar.h EFFECTIVE MERGES: 2008-05-19 17:02:33 +00:00
llstylemap.cpp QAR-872 Viewer 1.21 RC 3 2008-09-29 19:14:50 +00:00
llstylemap.h QAR-767 Combined maint-render-7 and maint-viewer-9 merge 2008-08-12 17:29:50 +00:00
llsurface.cpp EFFECTIVE MERGES: 2008-05-19 17:02:33 +00:00
llsurface.h EFFECTIVE MERGES: 2008-05-19 17:02:33 +00:00
llsurfacepatch.cpp QAR-650 - Viewer RC 9 merge -> release (post cmake) 2008-06-06 22:43:38 +00:00
llsurfacepatch.h EFFECTIVE MERGES: 2008-05-19 17:02:33 +00:00
lltable.h Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
lltexlayer.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
lltexlayer.h QAR-669 1.20 Viewer RC11 2008-06-27 21:02:01 +00:00
lltexturecache.cpp QAR-872 Viewer 1.21 RC 3 2008-09-29 19:14:50 +00:00
lltexturecache.h QAR-855 Viewer 1.21 RC 2 2008-09-12 06:27:13 +00:00
lltexturectrl.cpp QAR-872 Viewer 1.21 RC 3 2008-09-29 19:14:50 +00:00
lltexturectrl.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
lltexturefetch.cpp QAR-872 Viewer 1.21 RC 3 2008-09-29 19:14:50 +00:00
lltexturefetch.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
lltextureview.cpp QAR-767 Combined maint-render-7 and maint-viewer-9 merge 2008-08-12 17:29:50 +00:00
lltextureview.h merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
lltool.cpp QAR-767 Combined maint-render-7 and maint-viewer-9 merge 2008-08-12 17:29:50 +00:00
lltool.h QAR-767 Combined maint-render-7 and maint-viewer-9 merge 2008-08-12 17:29:50 +00:00
lltoolbar.cpp QAR-872 Viewer 1.21 RC 3 2008-09-29 19:14:50 +00:00
lltoolbar.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
lltoolbrush.cpp QAR-782 Merge featurettes batch #2 2008-08-13 19:37:05 +00:00
lltoolbrush.h QAR-650 - Viewer RC 9 merge -> release (post cmake) 2008-06-06 22:43:38 +00:00
lltoolcomp.cpp svn merge -r92720:92721 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-merge 2008-07-23 21:20:19 +00:00
lltoolcomp.h svn merge -r92720:92721 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-merge 2008-07-23 21:20:19 +00:00
lltooldraganddrop.cpp QAR-767 Combined maint-render-7 and maint-viewer-9 merge 2008-08-12 17:29:50 +00:00
lltooldraganddrop.h QAR-767 Combined maint-render-7 and maint-viewer-9 merge 2008-08-12 17:29:50 +00:00
lltoolface.cpp svn merge -r92720:92721 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-merge 2008-07-23 21:20:19 +00:00
lltoolface.h svn merge -r92720:92721 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-merge 2008-07-23 21:20:19 +00:00
lltoolfocus.cpp svn merge -r92720:92721 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-merge 2008-07-23 21:20:19 +00:00
lltoolfocus.h svn merge -r92720:92721 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-merge 2008-07-23 21:20:19 +00:00
lltoolgrab.cpp merge viewer/viewer_1-21 94170-94770 -> release 2008-08-28 23:57:41 +00:00
lltoolgrab.h svn merge -r92720:92721 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-merge 2008-07-23 21:20:19 +00:00
lltoolgun.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
lltoolgun.h merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
lltoolindividual.cpp svn merge -r92720:92721 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-merge 2008-07-23 21:20:19 +00:00
lltoolindividual.h svn merge -r92720:92721 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-merge 2008-07-23 21:20:19 +00:00
lltoolmgr.cpp QAR-872 Viewer 1.21 RC 3 2008-09-29 19:14:50 +00:00
lltoolmgr.h QAR-427 2008-04-04 01:22:03 +00:00
lltoolmorph.cpp QAR-650 - Viewer RC 9 merge -> release (post cmake) 2008-06-06 22:43:38 +00:00
lltoolmorph.h merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
lltoolobjpicker.cpp svn merge -r92720:92721 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-merge 2008-07-23 21:20:19 +00:00
lltoolobjpicker.h svn merge -r92720:92721 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-merge 2008-07-23 21:20:19 +00:00
lltoolpie.cpp QAR-872 Viewer 1.21 RC 3 2008-09-29 19:14:50 +00:00
lltoolpie.h QAR-872 Viewer 1.21 RC 3 2008-09-29 19:14:50 +00:00
lltoolpipette.cpp svn merge -r92720:92721 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-merge 2008-07-23 21:20:19 +00:00
lltoolpipette.h svn merge -r92720:92721 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-merge 2008-07-23 21:20:19 +00:00
lltoolplacer.cpp QAR-849 merge maint-viewer-10-merge 96838-97237 -> release 2008-09-23 01:53:11 +00:00
lltoolplacer.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
lltoolselect.cpp QAR-767 Combined maint-render-7 and maint-viewer-9 merge 2008-08-12 17:29:50 +00:00
lltoolselect.h svn merge -r92720:92721 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-merge 2008-07-23 21:20:19 +00:00
lltoolselectland.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
lltoolselectland.h QAR-650 - Viewer RC 9 merge -> release (post cmake) 2008-06-06 22:43:38 +00:00
lltoolselectrect.cpp svn merge -r92720:92721 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-merge 2008-07-23 21:20:19 +00:00
lltoolselectrect.h svn merge -r92720:92721 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-merge 2008-07-23 21:20:19 +00:00
lltoolview.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
lltoolview.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
lltracker.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
lltracker.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
lluiconstants.h Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
lluploaddialog.cpp QAR-767 Combined maint-render-7 and maint-viewer-9 merge 2008-08-12 17:29:50 +00:00
lluploaddialog.h merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986 : 80178 -> release. 2008-02-19 21:42:32 +00:00
llurl.cpp QAR-855 Viewer 1.21 RC 2 2008-09-12 06:27:13 +00:00
llurl.h QAR-855 Viewer 1.21 RC 2 2008-09-12 06:27:13 +00:00
llurldispatcher.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llurldispatcher.h merge Branch_1-19-0-Viewer -r 78432:78989 -> release 2008-02-01 22:10:40 +00:00
llurlhistory.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llurlhistory.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llurlwhitelist.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llurlwhitelist.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llvectorperfoptions.cpp merge release@82383 viewer-cleanup2-7-merge@82828 2008-03-20 21:41:26 +00:00
llvectorperfoptions.h merge release@82383 viewer-cleanup2-7-merge@82828 2008-03-20 21:41:26 +00:00
llviewchildren.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llviewchildren.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llviewerassetstorage.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llviewerassetstorage.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llvieweraudio.cpp QAR-849 merge maint-viewer-10-merge 96838-97237 -> release 2008-09-23 01:53:11 +00:00
llvieweraudio.h QAR-449 Viewer 1.20 RC 0 2008-04-17 02:42:27 +00:00
llviewercamera.cpp Merging in file-move-merge ( QAR-649 ) 2008-06-30 17:57:00 +00:00
llviewercamera.h Merging in file-move-merge ( QAR-649 ) 2008-06-30 17:57:00 +00:00
llviewercontrol.cpp QAR-855 Viewer 1.21 RC 2 2008-09-12 06:27:13 +00:00
llviewercontrol.h QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
llviewerdisplay.cpp QAR-855 Viewer 1.21 RC 2 2008-09-12 06:27:13 +00:00
llviewerdisplay.h QAR-650 - Viewer RC 9 merge -> release (post cmake) 2008-06-06 22:43:38 +00:00
llviewergenericmessage.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llviewergenericmessage.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llviewergesture.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llviewergesture.h Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
llviewerinventory.cpp QAR-751 : Merge Agent Inventory Services - Fetch Inventory and Fetch Inventory Descendents - to Release 2008-09-16 18:12:32 +00:00
llviewerinventory.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llviewerjoint.cpp QAR-669 1.20 Viewer RC11 2008-06-27 21:02:01 +00:00
llviewerjoint.h QAR-669 1.20 Viewer RC11 2008-06-27 21:02:01 +00:00
llviewerjointattachment.cpp QAR-767 Combined maint-render-7 and maint-viewer-9 merge 2008-08-12 17:29:50 +00:00
llviewerjointattachment.h QAR-669 1.20 Viewer RC11 2008-06-27 21:02:01 +00:00
llviewerjointmesh.cpp Merging in file-move-merge ( QAR-649 ) 2008-06-30 17:57:00 +00:00
llviewerjointmesh.h QAR-669 1.20 Viewer RC11 2008-06-27 21:02:01 +00:00
llviewerjointmesh_sse.cpp Merge of windlight into release (QAR-286). This includes all changes in 2008-02-27 18:58:14 +00:00
llviewerjointmesh_sse2.cpp Merge of windlight into release (QAR-286). This includes all changes in 2008-02-27 18:58:14 +00:00
llviewerjointmesh_vec.cpp Merge of windlight into release (QAR-286). This includes all changes in 2008-02-27 18:58:14 +00:00
llviewerjoystick.cpp QAR-767 Combined maint-render-7 and maint-viewer-9 merge 2008-08-12 17:29:50 +00:00
llviewerjoystick.h svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge 2008-06-02 21:14:31 +00:00
llviewerkeyboard.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llviewerkeyboard.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llviewerlayer.cpp Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
llviewerlayer.h Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
llviewermedia.cpp QAR-855 Viewer 1.21 RC 2 2008-09-12 06:27:13 +00:00
llviewermedia.h merge support-featurettes-snapshot-merge-2 for QAR-754, includes: 2008-07-18 17:50:25 +00:00
llviewermenu.cpp QAR-872 Viewer 1.21 RC 3 2008-09-29 19:14:50 +00:00
llviewermenu.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llviewermenufile.cpp svn merge -r95288:95907 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/qar-841 2008-09-05 22:03:35 +00:00
llviewermenufile.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llviewermessage.cpp svn merge -r98039:98711 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-24-Server --> release 2008-10-07 20:50:30 +00:00
llviewermessage.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llviewernetwork.cpp merge viewer/viewer_1-21 94170-94770 -> release 2008-08-28 23:57:41 +00:00
llviewernetwork.h merge viewer/viewer_1-21 94170-94770 -> release 2008-08-28 23:57:41 +00:00
llviewerobject.cpp QAR-849 merge maint-viewer-10-merge 96838-97237 -> release 2008-09-23 01:53:11 +00:00
llviewerobject.h QAR-767 Combined maint-render-7 and maint-viewer-9 merge 2008-08-12 17:29:50 +00:00
llviewerobjectlist.cpp merge viewer/viewer_1-21 94170-94770 -> release 2008-08-28 23:57:41 +00:00
llviewerobjectlist.h svn merge -r92720:92721 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-merge 2008-07-23 21:20:19 +00:00
llviewerparcelmedia.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llviewerparcelmedia.h Updated header comments with our public license statement that reflects their public nature. DEV-10766 2008-02-21 21:25:17 +00:00
llviewerparcelmediaautoplay.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llviewerparcelmediaautoplay.h Updated header comments with our public license statement that reflects their public nature. DEV-10766 2008-02-21 21:25:17 +00:00
llviewerparcelmgr.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llviewerparcelmgr.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llviewerparceloverlay.cpp QAR-650 - Viewer RC 9 merge -> release (post cmake) 2008-06-06 22:43:38 +00:00
llviewerparceloverlay.h merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llviewerpartsim.cpp QAR-767 Combined maint-render-7 and maint-viewer-9 merge 2008-08-12 17:29:50 +00:00
llviewerpartsim.h QAR-767 Combined maint-render-7 and maint-viewer-9 merge 2008-08-12 17:29:50 +00:00
llviewerpartsource.cpp QAR-767 Combined maint-render-7 and maint-viewer-9 merge 2008-08-12 17:29:50 +00:00
llviewerpartsource.h svn merge -r 86190:86191 maint-ui-11-merge (EFFECTIVE MERGE: -r 84579:85724 maint-ui-11-qa). 2008-04-30 23:30:09 +00:00
llviewerprecompiledheaders.cpp Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
llviewerprecompiledheaders.h merge support-featurettes-snapshot-merge-2 for QAR-754, includes: 2008-07-18 17:50:25 +00:00
llviewerregion.cpp QAR-751 : Merge Agent Inventory Services - Fetch Inventory and Fetch Inventory Descendents - to Release 2008-09-16 18:12:32 +00:00
llviewerregion.h merge viewer/viewer_1-21 94170-94770 -> release 2008-08-28 23:57:41 +00:00
llviewershadermgr.cpp QAR-767 Combined maint-render-7 and maint-viewer-9 merge 2008-08-12 17:29:50 +00:00
llviewershadermgr.h Merging in file-move-merge ( QAR-649 ) 2008-06-30 17:57:00 +00:00
llviewerstats.cpp QAR-855 Viewer 1.21 RC 2 2008-09-12 06:27:13 +00:00
llviewerstats.h svn merge -r93014:93396 svn+ssh://svn.lindenlab.com/svn/linden/branches/mono-r93014-qar633 dataserver-is-deprecated 2008-07-31 12:15:15 +00:00
llviewertexteditor.cpp QAR-849 merge maint-viewer-10-merge 96838-97237 -> release 2008-09-23 01:53:11 +00:00
llviewertexteditor.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llviewertextureanim.cpp Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
llviewertextureanim.h Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
llviewerthrottle.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llviewerthrottle.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llviewervisualparam.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llviewervisualparam.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llviewerwindow.cpp QAR-872 Viewer 1.21 RC 3 2008-09-29 19:14:50 +00:00
llviewerwindow.h QAR-872 Viewer 1.21 RC 3 2008-09-29 19:14:50 +00:00
llvlcomposition.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llvlcomposition.h Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
llvlmanager.cpp Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
llvlmanager.h Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
llvoavatar.cpp QAR-872 Viewer 1.21 RC 3 2008-09-29 19:14:50 +00:00
llvoavatar.h QAR-872 Viewer 1.21 RC 3 2008-09-29 19:14:50 +00:00
llvocache.cpp QAR-570 maint-render-4 merge 2008-05-08 18:41:20 +00:00
llvocache.h QAR-570 maint-render-4 merge 2008-05-08 18:41:20 +00:00
llvoclouds.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llvoclouds.h Merge of windlight into release (QAR-286). This includes all changes in 2008-02-27 18:58:14 +00:00
llvograss.cpp svn merge -r95288:95907 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/qar-841 2008-09-05 22:03:35 +00:00
llvograss.h QAR-570 maint-render-4 merge 2008-05-08 18:41:20 +00:00
llvoground.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llvoground.h Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
llvoiceclient.cpp QAR-855 Viewer 1.21 RC 2 2008-09-12 06:27:13 +00:00
llvoiceclient.h QAR-855 Viewer 1.21 RC 2 2008-09-12 06:27:13 +00:00
llvoicevisualizer.cpp QAR-767 Combined maint-render-7 and maint-viewer-9 merge 2008-08-12 17:29:50 +00:00
llvoicevisualizer.h QAR-650 - Viewer RC 9 merge -> release (post cmake) 2008-06-06 22:43:38 +00:00
llvoinventorylistener.cpp Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
llvoinventorylistener.h Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
llvopartgroup.cpp svn merge -r95288:95907 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/qar-841 2008-09-05 22:03:35 +00:00
llvopartgroup.h Merge of windlight into release (QAR-286). This includes all changes in 2008-02-27 18:58:14 +00:00
llvosky.cpp svn merge -r95288:95907 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/qar-841 2008-09-05 22:03:35 +00:00
llvosky.h svn merge -r 88991:89027 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-22-2-Server --> release 2008-06-07 00:47:05 +00:00
llvosurfacepatch.cpp QAR-650 - Viewer RC 9 merge -> release (post cmake) 2008-06-06 22:43:38 +00:00
llvosurfacepatch.h Merge of windlight into release (QAR-286). This includes all changes in 2008-02-27 18:58:14 +00:00
llvotextbubble.cpp svn merge -r95288:95907 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/qar-841 2008-09-05 22:03:35 +00:00
llvotextbubble.h 1.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426 2008-04-03 19:21:14 +00:00
llvotree.cpp svn merge -r95288:95907 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/qar-841 2008-09-05 22:03:35 +00:00
llvotree.h Merge of windlight into release (QAR-286). This includes all changes in 2008-02-27 18:58:14 +00:00
llvotreenew.h Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
llvovolume.cpp QAR-872 Viewer 1.21 RC 3 2008-09-29 19:14:50 +00:00
llvovolume.h QAR-767 Combined maint-render-7 and maint-viewer-9 merge 2008-08-12 17:29:50 +00:00
llvowater.cpp svn merge -r83872:83893 linden/branches/Branch_1-20-0-Server to linden/release 2008-04-03 22:50:22 +00:00
llvowater.h Merge of windlight into release (QAR-286). This includes all changes in 2008-02-27 18:58:14 +00:00
llvowlsky.cpp merge release-QAR-499 Viewer 1.20 RC 3 2008-04-28 23:29:46 +00:00
llvowlsky.h Merge of windlight into release (QAR-286). This includes all changes in 2008-02-27 18:58:14 +00:00
llwatchdog.cpp QAR-650 - Viewer RC 9 merge -> release (post cmake) 2008-06-06 22:43:38 +00:00
llwatchdog.h QAR-650 - Viewer RC 9 merge -> release (post cmake) 2008-06-06 22:43:38 +00:00
llwaterparammanager.cpp Merging in file-move-merge ( QAR-649 ) 2008-06-30 17:57:00 +00:00
llwaterparammanager.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llwaterparamset.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llwaterparamset.h Merging in file-move-merge ( QAR-649 ) 2008-06-30 17:57:00 +00:00
llwearable.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llwearable.h QAR-767 Combined maint-render-7 and maint-viewer-9 merge 2008-08-12 17:29:50 +00:00
llwearablelist.cpp QAR-767 Combined maint-render-7 and maint-viewer-9 merge 2008-08-12 17:29:50 +00:00
llwearablelist.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llweb.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llweb.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llwind.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llwind.h Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
llwindebug.cpp QAR-872 Viewer 1.21 RC 3 2008-09-29 19:14:50 +00:00
llwindebug.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llwlanimator.cpp Merge of windlight into release (QAR-286). This includes all changes in 2008-02-27 18:58:14 +00:00
llwlanimator.h Merge of windlight into release (QAR-286). This includes all changes in 2008-02-27 18:58:14 +00:00
llwldaycycle.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llwldaycycle.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llwlparammanager.cpp Merging in file-move-merge ( QAR-649 ) 2008-06-30 17:57:00 +00:00
llwlparammanager.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llwlparamset.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llwlparamset.h Merging in file-move-merge ( QAR-649 ) 2008-06-30 17:57:00 +00:00
llworld.cpp QAR-767 Combined maint-render-7 and maint-viewer-9 merge 2008-08-12 17:29:50 +00:00
llworld.h EFFECTIVE MERGES: 2008-05-19 17:02:33 +00:00
llworldmap.cpp QAR-782 Merge featurettes batch #2 2008-08-13 19:37:05 +00:00
llworldmap.h QAR-782 Merge featurettes batch #2 2008-08-13 19:37:05 +00:00
llworldmapview.cpp QAR-782 Merge featurettes batch #2 2008-08-13 19:37:05 +00:00
llworldmapview.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llxmlrpctransaction.cpp QAR-855 Viewer 1.21 RC 2 2008-09-12 06:27:13 +00:00
llxmlrpctransaction.h QAR-855 Viewer 1.21 RC 2 2008-09-12 06:27:13 +00:00
macmain.h Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
macutil_Prefix.h svn merge -r74104:74124 svn+ssh://svn/svn/linden/branches/crash-logger-cleanup-merge-6 2007-11-20 23:42:48 +00:00
macview.r Print done when done. 2007-01-02 08:33:20 +00:00
macview_Prefix.h svn merge -r83872:83893 linden/branches/Branch_1-20-0-Server to linden/release 2008-04-03 22:50:22 +00:00
noise.cpp Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
noise.h Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
pipeline.cpp QAR-849 merge maint-viewer-10-merge 96838-97237 -> release 2008-09-23 01:53:11 +00:00
pipeline.h QAR-855 Viewer 1.21 RC 2 2008-09-12 06:27:13 +00:00
secondlife-i686.supp Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
secondlife.icns merge viewer/viewer_1-21 94170-94770 -> release 2008-08-28 23:57:41 +00:00
secondlife_firstlook.icns merge viewer/viewer_1-21 94170-94770 -> release 2008-08-28 23:57:41 +00:00
viewer_manifest.py QAR-872 Viewer 1.21 RC 3 2008-09-29 19:14:50 +00:00