livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
phoenix-firestorm/indra/newview
History
Steven Bennetts 875606a04d QAR-566 maint-viewer-5-merge-2 
Effective merge: release@84102 maint-viewer-5@86348 -> maint-viewer-5-merge-2
Actual merge maint-viewer-5-merge-2 -r 87239 : 87246 -> release
 		2008-05-11 20:56:42 +00:00
..
English.lproj svn merge -r83893:84415 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-20-0-Server 2008-04-09 06:12:20 +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-566 maint-viewer-5-merge-2 2008-05-11 20:56:42 +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/windows QAR-460 Automatic XUI selection & Kick-ass Linux Fonts MergeMe 2008-04-17 14:56:00 +00:00
linux_tools svn merge -r 85582:85586 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-viewer-5-merge 2008-04-24 18:38:17 +00:00
res QAR-449 Viewer 1.20 RC 0 2008-04-17 02:42:27 +00:00
res-sdl 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
skins Print done when done. 2007-01-02 08:33:20 +00:00
Info-SecondLife.plist svn merge -r83893:84415 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-20-0-Server 2008-04-09 06:12:20 +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
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-449 Viewer 1.20 RC 0 2008-04-17 02:42:27 +00:00
featuretable_linux.txt 1.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426 2008-04-03 19:21:14 +00:00
featuretable_mac.txt 1.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426 2008-04-03 19:21:14 +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 merge release-QAR-511 Viewer 1.20 RC 5 2008-05-06 18:09:03 +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 Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated 2008-05-07 20:48:38 +00:00
llagent.h QAR-427 2008-04-04 01:22:03 +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
llagentpilot.cpp Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated 2008-05-07 20:48:38 +00:00
llagentpilot.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
llanimstatelabels.cpp 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
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-537 Viewer 1.20 RC 6 2008-05-09 20:57:23 +00:00
llappviewer.h QAR-488 Viewer 1.20 RC 2 2008-04-23 01:04:01 +00:00
llappviewerlinux.cpp QAR-570 maint-render-4 merge 2008-05-08 18:41:20 +00:00
llappviewerlinux.h QAR-449 Viewer 1.20 RC 0 2008-04-17 02:42:27 +00:00
llappviewermacosx.cpp QAR-449 Viewer 1.20 RC 1 2008-04-17 02:56:14 +00:00
llappviewermacosx.h QAR-449 Viewer 1.20 RC 0 2008-04-17 02:42:27 +00:00
llappviewerwin32.cpp QAR-460 Automatic XUI selection & Kick-ass Linux Fonts MergeMe 2008-04-17 14:56:00 +00:00
llappviewerwin32.h QAR-449 Viewer 1.20 RC 0 2008-04-17 02:42:27 +00:00
llassetuploadresponders.cpp Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated 2008-05-07 20:48:38 +00:00
llassetuploadresponders.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
llaudiosourcevo.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +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-570 maint-render-4 merge 2008-05-08 18:41:20 +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 svn merge -r 83778:83944 maint-ui-10-merge 2008-04-03 18:43:54 +00:00
llcallingcard.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
llcaphttpsender.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
llcaphttpsender.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
llchatbar.cpp 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
llchatbar.h merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +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 merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +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-449 Viewer 1.20 RC 1 2008-04-17 02:56:14 +00:00
llcommandlineparser.h QAR-449 Viewer 1.20 RC 1 2008-04-17 02:56:14 +00:00
llcompilequeue.cpp QAR-570 maint-render-4 merge 2008-05-08 18:41:20 +00:00
llcompilequeue.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
llconfirmationmanager.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
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 Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated 2008-05-07 20:48:38 +00:00
llcurrencyuimanager.h svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3 2007-10-10 00:01:43 +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 merge Branch_1-19-1-Viewer -r 80930 : 81609 -> release 2008-03-11 01:47:36 +00:00
lldebugmessagebox.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
lldebugview.cpp QAR-449 Viewer 1.20 RC 0 2008-04-17 02:42:27 +00:00
lldebugview.h merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
lldelayedgestureerror.cpp QAR-377 maintenance-6 merge: 2008-03-19 00:01:42 +00:00
lldelayedgestureerror.h QAR-377 maintenance-6 merge: 2008-03-19 00:01:42 +00:00
lldirpicker.cpp merge svn+ssh://steve@svn/svn/linden/branches/viewer-cleanup-3 -r 73026:73079 2007-11-07 22:55:27 +00:00
lldirpicker.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
lldrawable.cpp 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
lldrawable.h 1.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426 2008-04-03 19:21:14 +00:00
lldrawpool.cpp merge release-QAR-499 Viewer 1.20 RC 3 2008-04-28 23:29:46 +00:00
lldrawpool.h merge release-QAR-499 Viewer 1.20 RC 3 2008-04-28 23:29:46 +00:00
lldrawpoolalpha.cpp merge release-QAR-511 Viewer 1.20 RC 5 2008-05-06 18:09:03 +00:00
lldrawpoolalpha.h QAR-566 maint-viewer-5-merge-2 2008-05-11 20:56:42 +00:00
lldrawpoolavatar.cpp QAR-570 maint-render-4 merge 2008-05-08 18:41:20 +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 QAR-570 maint-render-4 merge 2008-05-08 18:41:20 +00:00
lldrawpoolbump.h Merge of windlight into release (QAR-286). This includes all changes in 2008-02-27 18:58:14 +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 merge release-QAR-499 Viewer 1.20 RC 3 2008-04-28 23:29:46 +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 merge release-QAR-499 Viewer 1.20 RC 3 2008-04-28 23:29:46 +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 merge release-QAR-499 Viewer 1.20 RC 3 2008-04-28 23:29:46 +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 QAR-537 Viewer 1.20 RC 6 2008-05-09 20:57:23 +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 merge release-QAR-499 Viewer 1.20 RC 3 2008-04-28 23:29:46 +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 merge release-QAR-499 Viewer 1.20 RC 3 2008-04-28 23:29:46 +00:00
lldrawpoolwater.h merge release@82858 maint-render-2-merge@83010 -> release 2008-03-25 22:50:26 +00:00
lldrawpoolwlsky.cpp merge release-QAR-499 Viewer 1.20 RC 3 2008-04-28 23:29:46 +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 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
lldriverparam.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
lldynamictexture.cpp QAR-570 maint-render-4 merge 2008-05-08 18:41:20 +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 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
lleventinfo.cpp merge svn+ssh://steve@svn/svn/linden/branches/viewer-cleanup-3 -r 73026:73079 2007-11-07 22:55:27 +00:00
lleventinfo.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
lleventnotifier.cpp Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated 2008-05-07 20:48:38 +00:00
lleventnotifier.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
lleventpoll.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
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-570 maint-render-4 merge 2008-05-08 18:41:20 +00:00
llface.h merge release-QAR-499 Viewer 1.20 RC 3 2008-04-28 23:29:46 +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-570 maint-render-4 merge 2008-05-08 18:41:20 +00:00
llfasttimerview.h merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llfeaturemanager.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llfeaturemanager.h QAR-570 maint-render-4 merge 2008-05-08 18:41:20 +00:00
llfilepicker.cpp 1.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426 2008-04-03 19:21:14 +00:00
llfilepicker.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
llfirstuse.cpp svn merge -r 83778:83944 maint-ui-10-merge 2008-04-03 18:43:54 +00:00
llfirstuse.h svn merge -r 83778:83944 maint-ui-10-merge 2008-04-03 18:43:54 +00:00
llflexibleobject.cpp merge release-QAR-499 Viewer 1.20 RC 3 2008-04-28 23:29:46 +00:00
llflexibleobject.h merge release-QAR-499 Viewer 1.20 RC 3 2008-04-28 23:29:46 +00:00
llfloaterabout.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +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-570 maint-render-4 merge 2008-05-08 18:41:20 +00:00
llfloateranimpreview.h merge release-QAR-511 Viewer 1.20 RC 5 2008-05-06 18:09:03 +00:00
llfloaterauction.cpp 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
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 merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llfloateravatarpicker.h merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llfloateravatartextures.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llfloateravatartextures.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
llfloaterbuildoptions.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +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 merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +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 merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llfloaterbuy.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
llfloaterbuycontents.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +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 merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +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 merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +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-449 Viewer 1.20 RC 0 2008-04-17 02:42:27 +00:00
llfloatercamera.h QAR-449 Viewer 1.20 RC 0 2008-04-17 02:42:27 +00:00
llfloaterchat.cpp 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
llfloaterchat.h merge release-QAR-499 Viewer 1.20 RC 2 (additional changes) 2008-04-28 22:19:05 +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-570 maint-render-4 merge 2008-05-08 18:41:20 +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 merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llfloaterdaycycle.h Merge of windlight into release (QAR-286). This includes all changes in 2008-02-27 18:58:14 +00:00
llfloaterenvsettings.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llfloaterenvsettings.h Merge of windlight into release (QAR-286). This includes all changes in 2008-02-27 18:58:14 +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 merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llfloaterfriends.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
llfloatergesture.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +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 merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llfloatergodtools.h svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3 2007-10-10 00:01:43 +00:00
llfloatergroupinvite.cpp Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated 2008-05-07 20:48:38 +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-537 Viewer 1.20 RC 6 2008-05-09 20:57:23 +00:00
llfloatergroups.h merge release@82383 viewer-cleanup2-7-merge@82828 2008-03-20 21:41:26 +00:00
llfloaterhardwaresettings.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llfloaterhardwaresettings.h merge release@82858 maint-render-2-merge@83010 -> release 2008-03-25 22:50:26 +00:00
llfloaterhud.cpp merge release-QAR-499 Viewer 1.20 RC 3 2008-04-28 23:29:46 +00:00
llfloaterhud.h merge release-QAR-499 Viewer 1.20 RC 3 2008-04-28 23:29:46 +00:00
llfloaterimagepreview.cpp QAR-570 maint-render-4 merge 2008-05-08 18:41:20 +00:00
llfloaterimagepreview.h 1.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426 2008-04-03 19:21:14 +00:00
llfloaterinspect.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +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-449 Viewer 1.20 RC 1 2008-04-17 02:56:14 +00:00
llfloaterjoystick.h QAR-427 2008-04-04 01:22:03 +00:00
llfloaterlagmeter.cpp QAR-449 Viewer 1.20 RC 0 2008-04-17 02:42:27 +00:00
llfloaterlagmeter.h QAR-449 Viewer 1.20 RC 0 2008-04-17 02:42:27 +00:00
llfloaterland.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llfloaterland.h merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llfloaterlandholdings.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llfloaterlandholdings.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
llfloatermap.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +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
llfloaternamedesc.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llfloaternamedesc.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
llfloateropenobject.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +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 merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llfloaterpostcard.h merge Branch_1-19-1-Viewer -r 80930 : 81609 -> release 2008-03-11 01:47:36 +00:00
llfloaterpostprocess.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +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-449 Viewer 1.20 RC 0 2008-04-17 02:42:27 +00:00
llfloaterpreference.h merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llfloaterproperties.cpp QAR-566 maint-viewer-5-merge-2 2008-05-11 20:56:42 +00:00
llfloaterproperties.h QAR-537 Viewer 1.20 RC 6 2008-05-09 20:57:23 +00:00
llfloaterregioninfo.cpp svn merge -r84080:84255 svn+ssh://svn/svn/linden/branches/intermezzo-9 2008-04-08 21:04:41 +00:00
llfloaterregioninfo.h merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llfloaterreporter.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llfloaterreporter.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
llfloaterscriptdebug.cpp 1.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426 2008-04-03 19:21:14 +00:00
llfloaterscriptdebug.h 1.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426 2008-04-03 19:21:14 +00:00
llfloatersellland.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +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 svn merge -r 83778:83944 maint-ui-10-merge 2008-04-03 18:43:54 +00:00
llfloatersettingsdebug.h merge release@82383 viewer-cleanup2-7-merge@82828 2008-03-20 21:41:26 +00:00
llfloatersnapshot.cpp QAR-537 Viewer 1.20 RC 6 2008-05-09 20:57:23 +00:00
llfloatersnapshot.h merge release@82858 maint-render-2-merge@83010 -> release 2008-03-25 22:50:26 +00:00
llfloatertelehub.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llfloatertelehub.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
llfloatertools.cpp merge release-QAR-511 Viewer 1.20 RC 5 2008-05-06 18:09:03 +00:00
llfloatertools.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
llfloatertopobjects.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llfloatertopobjects.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
llfloatertos.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llfloatertos.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
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 merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +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 svn merge -r 83778:83944 maint-ui-10-merge 2008-04-03 18:43:54 +00:00
llfloatervoicedevicesettings.h svn merge -r 83778:83944 maint-ui-10-merge 2008-04-03 18:43:54 +00:00
llfloaterwater.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llfloaterwater.h Merge of windlight into release (QAR-286). This includes all changes in 2008-02-27 18:58:14 +00:00
llfloaterwindlight.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llfloaterwindlight.h Merge of windlight into release (QAR-286). This includes all changes in 2008-02-27 18:58:14 +00:00
llfloaterworldmap.cpp QAR-449 Viewer 1.20 RC 1 2008-04-17 02:56:14 +00:00
llfloaterworldmap.h QAR-449 Viewer 1.20 RC 1 2008-04-17 02:56:14 +00:00
llfolderview.cpp 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
llfolderview.h 1.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426 2008-04-03 19:21:14 +00:00
llfollowcam.cpp Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated 2008-05-07 20:48:38 +00:00
llfollowcam.h Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated 2008-05-07 20:48:38 +00:00
llgesturemgr.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +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-570 maint-render-4 merge 2008-05-08 18:41:20 +00:00
llgroupmgr.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llgroupmgr.h merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +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-570 maint-render-4 merge 2008-05-08 18:41:20 +00:00
llhudeffectlookat.h QAR-488 Viewer 1.20 RC 2 2008-04-23 01:04:01 +00:00
llhudeffectpointat.cpp QAR-570 maint-render-4 merge 2008-05-08 18:41:20 +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-570 maint-render-4 merge 2008-05-08 18:41:20 +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 merge Branch_1-19-1-Viewer -r 80930 : 81609 -> release 2008-03-11 01:47:36 +00:00
llhudrender.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +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-570 maint-render-4 merge 2008-05-08 18:41:20 +00:00
llhudtext.h merge release@82858 maint-render-2-merge@83010 -> release 2008-03-25 22:50:26 +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 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
llimpanel.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
llimview.cpp 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
llimview.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
llinventorybridge.cpp Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated 2008-05-07 20:48:38 +00:00
llinventorybridge.h merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +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-570 maint-render-4 merge 2008-05-08 18:41:20 +00:00
llinventorymodel.h merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
lljoystickbutton.cpp QAR-570 maint-render-4 merge 2008-05-08 18:41:20 +00:00
lljoystickbutton.h merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +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-570 maint-render-4 merge 2008-05-08 18:41:20 +00:00
lllogchat.h svn merge -r 81304:81392 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-ui-8-merge 2008-03-04 16:59:57 +00:00
llmanip.cpp QAR-570 maint-render-4 merge 2008-05-08 18:41:20 +00:00
llmanip.h QAR-427 2008-04-04 01:22:03 +00:00
llmaniprotate.cpp QAR-570 maint-render-4 merge 2008-05-08 18:41:20 +00:00
llmaniprotate.h svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3 2007-10-10 00:01:43 +00:00
llmanipscale.cpp QAR-570 maint-render-4 merge 2008-05-08 18:41:20 +00:00
llmanipscale.h merge Branch_1-19-1-Viewer -r 80930 : 81609 -> release 2008-03-11 01:47:36 +00:00
llmaniptranslate.cpp QAR-570 maint-render-4 merge 2008-05-08 18:41:20 +00:00
llmaniptranslate.h merge Branch_1-19-1-Viewer -r 80930 : 81609 -> release 2008-03-11 01:47:36 +00:00
llmemoryview.cpp QAR-570 maint-render-4 merge 2008-05-08 18:41:20 +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 1.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426 2008-04-03 19:21:14 +00:00
llmimetypes.h 1.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426 2008-04-03 19:21:14 +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-449 Viewer 1.20 RC 0 2008-04-17 02:42:27 +00:00
llmoveview.h QAR-449 Viewer 1.20 RC 0 2008-04-17 02:42:27 +00:00
llmutelist.cpp QAR-570 maint-render-4 merge 2008-05-08 18:41:20 +00:00
llmutelist.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
llnamebox.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
llnamebox.h merge Branch_1-19-1-Viewer -r 80930 : 81609 -> release 2008-03-11 01:47:36 +00:00
llnameeditor.cpp 1.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426 2008-04-03 19:21:14 +00:00
llnameeditor.h 1.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426 2008-04-03 19:21:14 +00:00
llnamelistctrl.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llnamelistctrl.h merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llnetmap.cpp QAR-570 maint-render-4 merge 2008-05-08 18:41:20 +00:00
llnetmap.h merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
lloverlaybar.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
lloverlaybar.h 1.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426 2008-04-03 19:21:14 +00:00
llpanelavatar.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llpanelavatar.h merge Branch_1-19-1-Viewer -r 80930 : 81609 -> release 2008-03-11 01:47:36 +00:00
llpanelclassified.cpp QAR-565 search-milestone2-merge (more web tabs in search) 2008-05-09 04:39:03 +00:00
llpanelclassified.h QAR-565 search-milestone2-merge (more web tabs in search) 2008-05-09 04:39:03 +00:00
llpanelcontents.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +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 Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated 2008-05-07 20:48:38 +00:00
llpanelgroup.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
llpanelgroupgeneral.cpp QAR-565 search-milestone2-merge (more web tabs in search) 2008-05-09 04:39:03 +00:00
llpanelgroupgeneral.h QAR-565 search-milestone2-merge (more web tabs in search) 2008-05-09 04:39:03 +00:00
llpanelgroupinvite.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +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 merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llpanelgrouplandmoney.h svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3 2007-10-10 00:01:43 +00:00
llpanelgroupnotices.cpp 1.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426 2008-04-03 19:21:14 +00:00
llpanelgroupnotices.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
llpanelgrouproles.cpp Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated 2008-05-07 20:48:38 +00:00
llpanelgrouproles.h merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llpanelland.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +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 1.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426 2008-04-03 19:21:14 +00:00
llpanellandmedia.h 1.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426 2008-04-03 19:21:14 +00:00
llpanellogin.cpp merge release-QAR-499 Viewer 1.20 RC 3 2008-04-28 23:29:46 +00:00
llpanellogin.h svn merge -r 83778:83944 maint-ui-10-merge 2008-04-03 18:43:54 +00:00
llpanelobject.cpp merge release-QAR-499 Viewer 1.20 RC 2 (additional changes) 2008-04-28 22:19:05 +00:00
llpanelobject.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
llpanelpermissions.cpp QAR-566 maint-viewer-5-merge-2 2008-05-11 20:56:42 +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 merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llpanelpick.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
llpanelplace.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llpanelplace.h svn merge -r 73148:74186 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-5-Viewer --> release 2007-11-21 02:10:12 +00:00
llpanelvolume.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +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-570 maint-render-4 merge 2008-05-08 18:41:20 +00:00
llpolymesh.h merge Branch_1-19-1-Viewer -r 80930 : 81609 -> release 2008-03-11 01:47:36 +00:00
llpolymorph.cpp QAR-570 maint-render-4 merge 2008-05-08 18:41:20 +00:00
llpolymorph.h QAR-570 maint-render-4 merge 2008-05-08 18:41:20 +00:00
llpreview.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +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 merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llpreviewanim.h Merge of windlight into release (QAR-286). This includes all changes in 2008-02-27 18:58:14 +00:00
llpreviewgesture.cpp 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
llpreviewgesture.h merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llpreviewnotecard.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llpreviewnotecard.h merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llpreviewscript.cpp QAR-570 maint-render-4 merge 2008-05-08 18:41:20 +00:00
llpreviewscript.h merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llpreviewsound.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +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 1.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426 2008-04-03 19:21:14 +00:00
llpreviewtexture.h 1.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426 2008-04-03 19:21:14 +00:00
llprogressview.cpp QAR-488 Viewer 1.20 RC 2 2008-04-23 01:04:01 +00:00
llprogressview.h merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +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-566 maint-viewer-5-merge-2 2008-05-11 20:56:42 +00:00
llselectmgr.h Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated 2008-05-07 20:48:38 +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 Merge of windlight into release (QAR-286). This includes all changes in 2008-02-27 18:58:14 +00:00
llspatialpartition.cpp QAR-570 maint-render-4 merge 2008-05-08 18:41:20 +00:00
llspatialpartition.h Merge of windlight into release (QAR-286). This includes all changes in 2008-02-27 18:58:14 +00:00
llsprite.cpp Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated 2008-05-07 20:48:38 +00:00
llsprite.h Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated 2008-05-07 20:48:38 +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 QAR-565 search-milestone2-merge (more web tabs in search) 2008-05-09 04:39:03 +00:00
llstartup.h 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
llstatusbar.cpp Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated 2008-05-07 20:48:38 +00:00
llstatusbar.h Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated 2008-05-07 20:48:38 +00:00
llstylemap.cpp 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
llstylemap.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
llsurface.cpp Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated 2008-05-07 20:48:38 +00:00
llsurface.h Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated 2008-05-07 20:48:38 +00:00
llsurfacepatch.cpp Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated 2008-05-07 20:48:38 +00:00
llsurfacepatch.h Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated 2008-05-07 20:48:38 +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-570 maint-render-4 merge 2008-05-08 18:41:20 +00:00
lltexlayer.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
lltexturecache.cpp QAR-449 Viewer 1.20 RC 1 2008-04-17 02:56:14 +00:00
lltexturecache.h merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
lltexturectrl.cpp QAR-570 maint-render-4 merge 2008-05-08 18:41:20 +00:00
lltexturectrl.h 1.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426 2008-04-03 19:21:14 +00:00
lltexturefetch.cpp QAR-449 Viewer 1.20 RC 0 2008-04-17 02:42:27 +00:00
lltexturefetch.h merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
lltextureview.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
lltextureview.h merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
lltool.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
lltool.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
lltoolbar.cpp 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
lltoolbar.h 1.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426 2008-04-03 19:21:14 +00:00
lltoolbrush.cpp QAR-570 maint-render-4 merge 2008-05-08 18:41:20 +00:00
lltoolbrush.h merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
lltoolcomp.cpp QAR-427 2008-04-04 01:22:03 +00:00
lltoolcomp.h merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
lltooldraganddrop.cpp 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
lltooldraganddrop.h merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
lltoolface.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
lltoolface.h merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
lltoolfocus.cpp 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
lltoolfocus.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
lltoolgrab.cpp Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated 2008-05-07 20:48:38 +00:00
lltoolgrab.h merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
lltoolgun.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
lltoolgun.h merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
lltoolindividual.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
lltoolindividual.h merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
lltoolmgr.cpp QAR-427 2008-04-04 01:22:03 +00:00
lltoolmgr.h QAR-427 2008-04-04 01:22:03 +00:00
lltoolmorph.cpp QAR-570 maint-render-4 merge 2008-05-08 18:41:20 +00:00
lltoolmorph.h merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
lltoolobjpicker.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
lltoolobjpicker.h merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
lltoolpie.cpp svn merge -r 83778:83944 maint-ui-10-merge 2008-04-03 18:43:54 +00:00
lltoolpie.h merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
lltoolpipette.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
lltoolpipette.h merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
lltoolplacer.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
lltoolplacer.h merge svn+ssh://steve@svn/svn/linden/branches/viewer-cleanup-3 -r 73026:73079 2007-11-07 22:55:27 +00:00
lltoolselect.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
lltoolselect.h merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
lltoolselectland.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
lltoolselectland.h merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
lltoolselectrect.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
lltoolselectrect.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
lltoolview.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
lltoolview.h merge Branch_1-19-1-Viewer -r 80930 : 81609 -> release 2008-03-11 01:47:36 +00:00
lltracker.cpp QAR-570 maint-render-4 merge 2008-05-08 18:41:20 +00:00
lltracker.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
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 merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +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 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
llurl.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
llurldispatcher.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llurldispatcher.h merge Branch_1-19-0-Viewer -r 78432:78989 -> release 2008-02-01 22:10:40 +00:00
llurlhistory.cpp merge Branch_1-19-1-Viewer -r 80930 : 81609 -> release 2008-03-11 01:47:36 +00:00
llurlhistory.h Updated header comments with our public license statement that reflects their public nature. DEV-10766 2008-02-21 21:25:17 +00:00
llurlwhitelist.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
llurlwhitelist.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
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 merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llviewchildren.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
llviewerassetstorage.cpp QAR-570 maint-render-4 merge 2008-05-08 18:41:20 +00:00
llviewerassetstorage.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
llvieweraudio.cpp QAR-449 Viewer 1.20 RC 0 2008-04-17 02:42:27 +00:00
llvieweraudio.h QAR-449 Viewer 1.20 RC 0 2008-04-17 02:42:27 +00:00
llviewercamera.cpp QAR-427 2008-04-04 01:22:03 +00:00
llviewercamera.h merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llviewercontrol.cpp QAR-570 maint-render-4 merge 2008-05-08 18:41:20 +00:00
llviewercontrol.h merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llviewerdisplay.cpp QAR-570 maint-render-4 merge 2008-05-08 18:41:20 +00:00
llviewerdisplay.h Merge of windlight into release (QAR-286). This includes all changes in 2008-02-27 18:58:14 +00:00
llviewergenericmessage.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
llviewergenericmessage.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
llviewergesture.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
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-570 maint-render-4 merge 2008-05-08 18:41:20 +00:00
llviewerinventory.h QAR-570 maint-render-4 merge 2008-05-08 18:41:20 +00:00
llviewerjoint.cpp QAR-570 maint-render-4 merge 2008-05-08 18:41:20 +00:00
llviewerjoint.h 1.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426 2008-04-03 19:21:14 +00:00
llviewerjointattachment.cpp QAR-570 maint-render-4 merge 2008-05-08 18:41:20 +00:00
llviewerjointattachment.h Merge of windlight into release (QAR-286). This includes all changes in 2008-02-27 18:58:14 +00:00
llviewerjointmesh.cpp merge release-QAR-499 Viewer 1.20 RC 3 2008-04-28 23:29:46 +00:00
llviewerjointmesh.h merge release@82383 viewer-cleanup2-7-merge@82828 2008-03-20 21:41:26 +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-537 Viewer 1.20 RC 6 2008-05-09 20:57:23 +00:00
llviewerjoystick.h QAR-449 Viewer 1.20 RC 1 2008-04-17 02:56:14 +00:00
llviewerkeyboard.cpp QAR-570 maint-render-4 merge 2008-05-08 18:41:20 +00:00
llviewerkeyboard.h Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated 2008-05-07 20:48:38 +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 1.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426 2008-04-03 19:21:14 +00:00
llviewermedia.h Updated header comments with our public license statement that reflects their public nature. DEV-10766 2008-02-21 21:25:17 +00:00
llviewermenu.cpp QAR-566 maint-viewer-5-merge-2 2008-05-11 20:56:42 +00:00
llviewermenu.h QAR-427 2008-04-04 01:22:03 +00:00
llviewermenufile.cpp QAR-537 Viewer 1.20 RC 6 2008-05-09 20:57:23 +00:00
llviewermenufile.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
llviewermessage.cpp QAR-537 Viewer 1.20 RC 6 2008-05-09 20:57:23 +00:00
llviewermessage.h merge Branch_1-19-1-Viewer -r 80930 : 81609 -> release 2008-03-11 01:47:36 +00:00
llviewernetwork.cpp merge release@82383 viewer-cleanup2-7-merge@82828 2008-03-20 21:41:26 +00:00
llviewernetwork.h merge release@82383 viewer-cleanup2-7-merge@82828 2008-03-20 21:41:26 +00:00
llviewerobject.cpp merge release-QAR-511 Viewer 1.20 RC 5 2008-05-06 18:09:03 +00:00
llviewerobject.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
llviewerobjectlist.cpp QAR-537 Viewer 1.20 RC 6 2008-05-09 20:57:23 +00:00
llviewerobjectlist.h merge Branch_1-19-1-Viewer -r 80930 : 81609 -> release 2008-03-11 01:47:36 +00:00
llviewerparcelmedia.cpp QAR-537 Viewer 1.20 RC 6 2008-05-09 20:57:23 +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 Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated 2008-05-07 20:48:38 +00:00
llviewerparcelmgr.h merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llviewerparceloverlay.cpp QAR-537 Viewer 1.20 RC 6 2008-05-09 20:57:23 +00:00
llviewerparceloverlay.h merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llviewerpartsim.cpp svn merge -r83872:83893 linden/branches/Branch_1-20-0-Server to linden/release 2008-04-03 22:50:22 +00:00
llviewerpartsim.h merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llviewerpartsource.cpp 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
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 Branch_1-19-1-Viewer -r 80930 : 81609 -> release 2008-03-11 01:47:36 +00:00
llviewerregion.cpp QAR-570 maint-render-4 merge 2008-05-08 18:41:20 +00:00
llviewerregion.h merge Branch_1-19-1-Viewer -r 80930 : 81609 -> release 2008-03-11 01:47:36 +00:00
llviewerstats.cpp QAR-565 search-milestone2-merge (more web tabs in search) 2008-05-09 04:39:03 +00:00
llviewerstats.h svn merge -r83872:83893 linden/branches/Branch_1-20-0-Server to linden/release 2008-04-03 22:50:22 +00:00
llviewertexteditor.cpp 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
llviewertexteditor.h svn merge -r 81304:81392 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-ui-8-merge 2008-03-04 16:59:57 +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 merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llviewerthrottle.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
llviewervisualparam.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
llviewervisualparam.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
llviewerwindow.cpp QAR-570 maint-render-4 merge 2008-05-08 18:41:20 +00:00
llviewerwindow.h QAR-565 search-milestone2-merge (more web tabs in search) 2008-05-09 04:39:03 +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-537 Viewer 1.20 RC 6 2008-05-09 20:57:23 +00:00
llvoavatar.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
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 merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +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 Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated 2008-05-07 20:48:38 +00:00
llvoiceclient.h QAR-468 "Babble Lipsync MergeMe" 2008-04-22 16:17:22 +00:00
llvoicevisualizer.cpp QAR-570 maint-render-4 merge 2008-05-08 18:41:20 +00:00
llvoicevisualizer.h QAR-468 "Babble Lipsync MergeMe" 2008-04-22 16:17:22 +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 merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +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 QAR-566 maint-viewer-5-merge-2 2008-05-11 20:56:42 +00:00
llvosky.h QAR-566 maint-viewer-5-merge-2 2008-05-11 20:56:42 +00:00
llvosurfacepatch.cpp 1.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426 2008-04-03 19:21:14 +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 -r83872:83893 linden/branches/Branch_1-20-0-Server to linden/release 2008-04-03 22:50:22 +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 merge release-QAR-499 Viewer 1.20 RC 3 2008-04-28 23:29:46 +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 merge release-QAR-499 Viewer 1.20 RC 3 2008-04-28 23:29:46 +00:00
llvovolume.h 1.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426 2008-04-03 19:21:14 +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
llwaterparammanager.cpp QAR-566 maint-viewer-5-merge-2 2008-05-11 20:56:42 +00:00
llwaterparammanager.h QAR-566 maint-viewer-5-merge-2 2008-05-11 20:56:42 +00:00
llwaterparamset.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llwaterparamset.h Merge of windlight into release (QAR-286). This includes all changes in 2008-02-27 18:58:14 +00:00
llwearable.cpp QAR-570 maint-render-4 merge 2008-05-08 18:41:20 +00:00
llwearable.h QAR-570 maint-render-4 merge 2008-05-08 18:41:20 +00:00
llwearablelist.cpp QAR-570 maint-render-4 merge 2008-05-08 18:41:20 +00:00
llwearablelist.h QAR-377 maintenance-6 merge: 2008-03-19 00:01:42 +00:00
llweb.cpp 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
llweb.h merge of age verification changes from QAR-76 to release; changes were originally made on the age_verification_2007xxxx branches; final changes were QA'd on age_verification_20071112. 2007-11-15 19:10:29 +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 1.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426 2008-04-03 19:21:14 +00:00
llwindebug.h 1.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426 2008-04-03 19:21:14 +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 Merge of windlight into release (QAR-286). This includes all changes in 2008-02-27 18:58:14 +00:00
llwldaycycle.h Merge of windlight into release (QAR-286). This includes all changes in 2008-02-27 18:58:14 +00:00
llwlparammanager.cpp QAR-566 maint-viewer-5-merge-2 2008-05-11 20:56:42 +00:00
llwlparammanager.h QAR-566 maint-viewer-5-merge-2 2008-05-11 20:56:42 +00:00
llwlparamset.cpp Merge of windlight into release (QAR-286). This includes all changes in 2008-02-27 18:58:14 +00:00
llwlparamset.h QAR-566 maint-viewer-5-merge-2 2008-05-11 20:56:42 +00:00
llworld.cpp QAR-566 maint-viewer-5-merge-2 2008-05-11 20:56:42 +00:00
llworld.h Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated 2008-05-07 20:48:38 +00:00
llworldmap.cpp QAR-565 search-milestone2-merge (more web tabs in search) 2008-05-09 04:39:03 +00:00
llworldmap.h QAR-565 search-milestone2-merge (more web tabs in search) 2008-05-09 04:39:03 +00:00
llworldmapview.cpp QAR-565 search-milestone2-merge (more web tabs in search) 2008-05-09 04:39:03 +00:00
llworldmapview.h QAR-565 search-milestone2-merge (more web tabs in search) 2008-05-09 04:39:03 +00:00
llxmlrpctransaction.cpp merge release@82383 viewer-cleanup2-7-merge@82828 2008-03-20 21:41:26 +00:00
llxmlrpctransaction.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
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-537 Viewer 1.20 RC 6 2008-05-09 20:57:23 +00:00
pipeline.h QAR-570 maint-render-4 merge 2008-05-08 18:41:20 +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 Print done when done. 2007-01-02 08:33:20 +00:00
viewer_manifest.py QAR-566 maint-viewer-5-merge-2 2008-05-11 20:56:42 +00:00