Steven Bennetts ccb1d2b1e4 merge -r 1609-1612 https://svn.aws.productengine.com/secondlife/pe/stable-2 -> viewer-2.0.0-3 ... Fixes: EXT-825 EXT-893 EXT-889 EXT-88		2009-09-10 03:12:12 +00:00
..
English.lproj	…
German.lproj	…
Japanese.lproj	…
Korean.lproj	…
SecondLife.nib	…
app_settings	merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1	2009-09-09 01:26:44 +00:00
character	…
cursors_mac	…
da.lproj	Sync up with a number of SVN changes that snuck in via weird merges	2009-09-01 11:04:15 -07:00
es.lproj	Sync up with a number of SVN changes that snuck in via weird merges	2009-09-01 11:04:15 -07:00
fonts	…
fr.lproj	Sync up with a number of SVN changes that snuck in via weird merges	2009-09-01 11:04:15 -07:00
hu.lproj	Sync up with a number of SVN changes that snuck in via weird merges	2009-09-01 11:04:15 -07:00
installers	Sync up with a number of SVN changes that snuck in via weird merges	2009-09-01 11:04:15 -07:00
it.lproj	Sync up with a number of SVN changes that snuck in via weird merges	2009-09-01 11:04:15 -07:00
linux_tools	svn merge -r130238:130240 svn+ssh://svn.lindenlab.com/svn/linden/branches/linux-updater-6	2009-08-21 21:52:21 +00:00
nl.lproj	Sync up with a number of SVN changes that snuck in via weird merges	2009-09-01 11:04:15 -07:00
pl.lproj	Sync up with a number of SVN changes that snuck in via weird merges	2009-09-01 11:04:15 -07:00
pt.lproj	Sync up with a number of SVN changes that snuck in via weird merges	2009-09-01 11:04:15 -07:00
res	…
ru.lproj	Sync up with a number of SVN changes that snuck in via weird merges	2009-09-01 11:04:15 -07:00
skins	merge -r 1609-1612 https://svn.aws.productengine.com/secondlife/pe/stable-2 -> viewer-2.0.0-3	2009-09-10 03:12:12 +00:00
tests	…
tr.lproj	Sync up with a number of SVN changes that snuck in via weird merges	2009-09-01 11:04:15 -07:00
uk.lproj	Sync up with a number of SVN changes that snuck in via weird merges	2009-09-01 11:04:15 -07:00
zh-Hans.lproj	Sync up with a number of SVN changes that snuck in via weird merges	2009-09-01 11:04:15 -07:00
CMakeLists.txt	merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1	2009-09-09 01:26:44 +00:00
Info-SecondLife.plist	…
Info-SecondLifeVorbis.plist	…
VertexCache.h	…
ViewerInstall.cmake	…
VorbisFramework.h	…
build_win32_appConfig.py	Applied path from "[sldev-commits] r2604 - projects/2009/snowglobe/trunk/indra/newview"	2009-08-20 21:16:18 +00:00
featuretable.txt	Sync up with a number of SVN changes that snuck in via weird merges	2009-09-01 11:04:15 -07:00
featuretable_linux.txt	Sync up with a number of SVN changes that snuck in via weird merges	2009-09-01 11:04:15 -07:00
featuretable_mac.txt	Sync up with a number of SVN changes that snuck in via weird merges	2009-09-01 11:04:15 -07:00
featuretable_solaris.txt	…
fmod_hidden_symbols.exp	…
fmodwrapper.cpp	…
gpu_table.txt	Dev-36747	2009-08-18 17:49:03 +00:00
licenses-linux.txt	…
licenses-mac.txt	…
licenses-solaris.txt	…
licenses-win32.txt	…
llagent.cpp	merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1566 https://svn.aws.productengine.com/secondlife/pe/stable-2@1580 -> viewer-2.0.0-3	2009-09-07 22:55:07 +00:00
llagent.h	svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1480 https://svn.aws.productengine.com/secondlife/pe/stable-2@1489 -> viewer-2.0.0-3	2009-08-28 22:30:09 +00:00
llagentaccess.cpp	…
llagentaccess.h	…
llagentdata.cpp	…
llagentdata.h	…
llagentlanguage.cpp	…
llagentlanguage.h	…
llagentpilot.cpp	…
llagentpilot.h	…
llagentui.cpp	svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1480 https://svn.aws.productengine.com/secondlife/pe/stable-2@1489 -> viewer-2.0.0-3	2009-08-28 22:30:09 +00:00
llagentui.h	svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1480 https://svn.aws.productengine.com/secondlife/pe/stable-2@1489 -> viewer-2.0.0-3	2009-08-28 22:30:09 +00:00
llagentwearables.cpp	For DEV-34223: Avatar Pipeline Project - M6 (Current Outfit Folder). Make sure that only wearables from the COF are handled as wearables during initial COF load. Added error checking for null asset IDs. This fixes a crash on login observed after loading from COF was enabled.	2009-08-18 20:18:40 +00:00
llagentwearables.h	svn merge -r130469:130817 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-6 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-18 15:34:09 +00:00
llanimstatelabels.cpp	…
llanimstatelabels.h	…
llappearance.h	…
llappviewer.cpp	merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1	2009-09-09 01:26:44 +00:00
llappviewer.h	merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/indra@1170 https://svn.aws.productengine.com/secondlife/pe/stable-1/indra@1187 -> viewer-2.0.0-3	2009-07-30 23:22:41 +00:00
llappviewerlinux.cpp	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
llappviewerlinux.h	…
llappviewerlinux_api.h	…
llappviewerlinux_api.xml	…
llappviewerlinux_api_dbus.cpp	…
llappviewerlinux_api_dbus.h	…
llappviewerlinux_api_dbus_syms_raw.inc	…
llappviewermacosx.cpp	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
llappviewermacosx.h	Sync up with a number of SVN changes that snuck in via weird merges	2009-09-01 11:04:15 -07:00
llappviewerwin32.cpp	…
llappviewerwin32.h	…
llassetuploadqueue.cpp	…
llassetuploadqueue.h	…
llassetuploadresponders.cpp	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
llassetuploadresponders.h	Merged work for DEV-2066 (and formerly QAR-1538) in Viewer 2.	2009-07-16 17:54:58 +00:00
llaudiosourcevo.cpp	…
llaudiosourcevo.h	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
llavataractions.cpp	svn merge -r 1490-1500 https://svn.aws.productengine.com/secondlife/pe/stable-2	2009-08-28 22:58:17 +00:00
llavataractions.h	merge https://svn.aws.productengine.com/secondlife/export-from-ll@1277 https://svn.aws.productengine.com/secondlife/pe/stable-1@1297 -> viewer-2-0	2009-08-12 01:12:27 +00:00
llavatariconctrl.cpp	merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1	2009-09-09 01:26:44 +00:00
llavatariconctrl.h	skinning-22 -> viewer-2 trunk to pick up bug fixes, including crash on script compile when cursor is at the end of the script editor window. Replaced panel_pick_info.xml and panel_profile_view.xml with our versions, which stomped some PE changes. Panels still work, however, and Kurt is still working on layout.	2009-08-28 16:51:34 +00:00
llavatarlist.cpp	merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1566 https://svn.aws.productengine.com/secondlife/pe/stable-2@1580 -> viewer-2.0.0-3	2009-09-07 22:55:07 +00:00
llavatarlist.h	merge https://svn.aws.productengine.com/secondlife/export-from-ll@1277 https://svn.aws.productengine.com/secondlife/pe/stable-1@1297 -> viewer-2-0	2009-08-12 01:12:27 +00:00
llavatarlistitem.cpp	skinning-22 -> viewer-2 trunk to pick up bug fixes, including crash on script compile when cursor is at the end of the script editor window. Replaced panel_pick_info.xml and panel_profile_view.xml with our versions, which stomped some PE changes. Panels still work, however, and Kurt is still working on layout.	2009-08-28 16:51:34 +00:00
llavatarlistitem.h	skinning-22 -> viewer-2 trunk to pick up bug fixes, including crash on script compile when cursor is at the end of the script editor window. Replaced panel_pick_info.xml and panel_profile_view.xml with our versions, which stomped some PE changes. Panels still work, however, and Kurt is still working on layout.	2009-08-28 16:51:34 +00:00
llavatarpropertiesprocessor.cpp	merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1	2009-09-09 01:26:44 +00:00
llavatarpropertiesprocessor.h	merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1	2009-09-09 01:26:44 +00:00
llbottomtray.cpp	merge -r 1609-1612 https://svn.aws.productengine.com/secondlife/pe/stable-2 -> viewer-2.0.0-3	2009-09-10 03:12:12 +00:00
llbottomtray.h	merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1566 https://svn.aws.productengine.com/secondlife/pe/stable-2@1580 -> viewer-2.0.0-3	2009-09-07 22:55:07 +00:00
llbox.cpp	…
llbox.h	…
llbreadcrumbview.cpp	…
llbreadcrumbview.h	…
llcallbacklist.cpp	…
llcallbacklist.h	…
llcallingcard.cpp	svn merge -r 1490-1500 https://svn.aws.productengine.com/secondlife/pe/stable-2	2009-08-28 22:58:17 +00:00
llcallingcard.h	svn merge -r 1490-1500 https://svn.aws.productengine.com/secondlife/pe/stable-2	2009-08-28 22:58:17 +00:00
llcapabilitylistener.cpp	…
llcapabilitylistener.h	…
llcapabilityprovider.h	…
llcaphttpsender.cpp	…
llcaphttpsender.h	…
llchannelmanager.cpp	svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3	2009-08-26 20:47:27 +00:00
llchannelmanager.h	svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3	2009-08-26 20:47:27 +00:00
llchatbar.cpp	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
llchatbar.h	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llchatitemscontainerctrl.cpp	merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1	2009-09-09 01:26:44 +00:00
llchatitemscontainerctrl.h	merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/indra@1170 https://svn.aws.productengine.com/secondlife/pe/stable-1/indra@1187 -> viewer-2.0.0-3	2009-07-30 23:22:41 +00:00
llchatmsgbox.cpp	Merging the SLURLs Everywhere branch (viewer-2.0.0-slurls-3) into	2009-09-04 12:11:27 +00:00
llchatmsgbox.h	Merging the SLURLs Everywhere branch (viewer-2.0.0-slurls-3) into	2009-09-04 12:11:27 +00:00
llchiclet.cpp	merge -r 1609-1612 https://svn.aws.productengine.com/secondlife/pe/stable-2 -> viewer-2.0.0-3	2009-09-10 03:12:12 +00:00
llchiclet.h	merge -r 1586-1593 https://svn.aws.productengine.com/secondlife/pe/stable-2 -> viewer-2.0.0-3	2009-09-09 04:27:06 +00:00
llclassifiedinfo.cpp	…
llclassifiedinfo.h	…
llclassifiedstatsresponder.cpp	svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3	2009-08-26 20:47:27 +00:00
llclassifiedstatsresponder.h	Merged work for DEV-2066 (and formerly QAR-1538) in Viewer 2.	2009-07-16 17:54:58 +00:00
llcloud.cpp	…
llcloud.h	…
llcolorswatch.cpp	merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1	2009-09-09 01:26:44 +00:00
llcolorswatch.h	…
llcommandhandler.cpp	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
llcommandhandler.h	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
llcommandlineparser.cpp	…
llcommandlineparser.h	…
llcompilequeue.cpp	…
llcompilequeue.h	…
llconfirmationmanager.cpp	merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1	2009-09-09 01:26:44 +00:00
llconfirmationmanager.h	…
llcurrencyuimanager.cpp	…
llcurrencyuimanager.h	…
llcylinder.cpp	…
llcylinder.h	…
lldebugmessagebox.cpp	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
lldebugmessagebox.h	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
lldebugview.cpp	…
lldebugview.h	…
lldelayedgestureerror.cpp	…
lldelayedgestureerror.h	…
lldirpicker.cpp	…
lldirpicker.h	…
lldrawable.cpp	merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3	2009-08-24 20:04:52 +00:00
lldrawable.h	merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3	2009-08-24 20:04:52 +00:00
lldrawpool.cpp	…
lldrawpool.h	…
lldrawpoolalpha.cpp	svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3	2009-08-26 20:47:27 +00:00
lldrawpoolalpha.h	…
lldrawpoolavatar.cpp	svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3	2009-08-26 20:47:27 +00:00
lldrawpoolavatar.h	…
lldrawpoolbump.cpp	svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3	2009-08-26 20:47:27 +00:00
lldrawpoolbump.h	…
lldrawpoolclouds.cpp	…
lldrawpoolclouds.h	…
lldrawpoolground.cpp	…
lldrawpoolground.h	…
lldrawpoolsimple.cpp	svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3	2009-08-26 20:47:27 +00:00
lldrawpoolsimple.h	…
lldrawpoolsky.cpp	…
lldrawpoolsky.h	Sync up with a number of SVN changes that snuck in via weird merges	2009-09-01 11:04:15 -07:00
lldrawpoolterrain.cpp	merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3	2009-08-24 20:04:52 +00:00
lldrawpoolterrain.h	…
lldrawpooltree.cpp	merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3	2009-08-24 20:04:52 +00:00
lldrawpooltree.h	…
lldrawpoolwater.cpp	merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3	2009-08-24 20:04:52 +00:00
lldrawpoolwater.h	…
lldrawpoolwlsky.cpp	svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3	2009-08-26 20:47:27 +00:00
lldrawpoolwlsky.h	…
lldriverparam.cpp	…
lldriverparam.h	…
lldynamictexture.cpp	…
lldynamictexture.h	…
llemote.cpp	svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3	2009-08-26 20:47:27 +00:00
llemote.h	…
lleventinfo.cpp	…
lleventinfo.h	…
lleventnotifier.cpp	…
lleventnotifier.h	…
lleventpoll.cpp	…
lleventpoll.h	…
llface.cpp	…
llface.h	…
llface.inl	…
llfasttimerview.cpp	merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1	2009-09-09 01:26:44 +00:00
llfasttimerview.h	merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1	2009-09-09 01:26:44 +00:00
llfavoritesbar.cpp	merge merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1581 https://svn.aws.productengine.com/secondlife/pe/stable-2@1585 -> viewer-2.0.0-3	2009-09-09 04:12:50 +00:00
llfavoritesbar.h	merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1566 https://svn.aws.productengine.com/secondlife/pe/stable-2@1580 -> viewer-2.0.0-3	2009-09-07 22:55:07 +00:00
llfeaturemanager.cpp	…
llfeaturemanager.h	…
llfilepicker.cpp	…
llfilepicker.h	…
llfirstuse.cpp	Merge xui-army-8 to pick up 2+ weeks of art, colors, and dialog layout changes.	2009-07-27 16:50:01 +00:00
llfirstuse.h	Merge xui-army-8 to pick up 2+ weeks of art, colors, and dialog layout changes.	2009-07-27 16:50:01 +00:00
llflexibleobject.cpp	merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3	2009-08-24 20:04:52 +00:00
llflexibleobject.h	…
llfloaterabout.cpp	Merging the SLURLs Everywhere branch (viewer-2.0.0-slurls-3) into	2009-09-04 12:11:27 +00:00
llfloaterabout.h	…
llfloateranimpreview.cpp	merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1	2009-09-09 01:26:44 +00:00
llfloateranimpreview.h	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llfloaterauction.cpp	…
llfloaterauction.h	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llfloateravatarpicker.cpp	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llfloateravatarpicker.h	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llfloateravatartextures.cpp	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llfloateravatartextures.h	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llfloaterbeacons.cpp	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llfloaterbeacons.h	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llfloaterbuildoptions.cpp	…
llfloaterbuildoptions.h	…
llfloaterbulkpermission.cpp	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llfloaterbulkpermission.h	…
llfloaterbump.cpp	…
llfloaterbump.h	…
llfloaterbuy.cpp	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llfloaterbuy.h	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llfloaterbuycontents.cpp	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llfloaterbuycontents.h	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llfloaterbuycurrency.cpp	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llfloaterbuycurrency.h	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llfloaterbuyland.cpp	merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3	2009-08-24 20:04:52 +00:00
llfloaterbuyland.h	merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3	2009-08-24 20:04:52 +00:00
llfloatercamera.cpp	merge https://svn.aws.productengine.com/secondlife/export-from-ll@1277 https://svn.aws.productengine.com/secondlife/pe/stable-1@1297 -> viewer-2-0	2009-08-12 01:12:27 +00:00
llfloatercamera.h	merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1211 https://svn.aws.productengine.com/secondlife/pe/stable-1@1228 -> viewer-2.0.0-3	2009-08-03 22:25:48 +00:00
llfloaterchat.cpp	merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1566 https://svn.aws.productengine.com/secondlife/pe/stable-2@1580 -> viewer-2.0.0-3	2009-09-07 22:55:07 +00:00
llfloaterchat.h	merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3	2009-08-24 20:04:52 +00:00
llfloaterchatterbox.cpp	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llfloaterchatterbox.h	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llfloatercolorpicker.cpp	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llfloatercolorpicker.h	…
llfloaterdaycycle.cpp	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llfloaterdaycycle.h	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llfloaterenvsettings.cpp	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llfloaterenvsettings.h	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llfloaterfonttest.cpp	…
llfloaterfonttest.h	…
llfloaterfriends.cpp	Merging the SLURLs Everywhere branch (viewer-2.0.0-slurls-3) into	2009-09-04 12:11:27 +00:00
llfloaterfriends.h	…
llfloatergesture.cpp	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llfloatergesture.h	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llfloatergodtools.cpp	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llfloatergodtools.h	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llfloatergroupinvite.cpp	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llfloatergroupinvite.h	…
llfloatergroups.cpp	Merging the SLURLs Everywhere branch (viewer-2.0.0-slurls-3) into	2009-09-04 12:11:27 +00:00
llfloatergroups.h	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llfloaterhandler.cpp	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
llfloaterhandler.h	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
llfloaterhardwaresettings.cpp	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llfloaterhardwaresettings.h	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llfloaterhud.cpp	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
llfloaterhud.h	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
llfloaterimagepreview.cpp	merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1	2009-09-09 01:26:44 +00:00
llfloaterimagepreview.h	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llfloaterinspect.cpp	merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/indra@1059 https://svn.aws.productengine.com/secondlife/pe/stable-1/indra@1070 -> svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-07-21 00:57:23 +00:00
llfloaterinspect.h	…
llfloaterinventory.cpp	merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3	2009-08-24 20:04:52 +00:00
llfloaterinventory.h	svn merge -r129617:130277 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-5 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-12 19:03:20 +00:00
llfloaterjoystick.cpp	…
llfloaterjoystick.h	…
llfloaterlagmeter.cpp	svn merge -r 129543-130091 skinning-19 -> viewer-2.0.0-3	2009-08-11 06:37:35 +00:00
llfloaterlagmeter.h	…
llfloaterland.cpp	Merging the SLURLs Everywhere branch (viewer-2.0.0-slurls-3) into	2009-09-04 12:11:27 +00:00
llfloaterland.h	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
llfloaterlandholdings.cpp	merge https://svn.aws.productengine.com/secondlife/export-from-ll@1277 https://svn.aws.productengine.com/secondlife/pe/stable-1@1297 -> viewer-2-0	2009-08-12 01:12:27 +00:00
llfloaterlandholdings.h	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llfloatermap.cpp	EXT-729 - moved XML from menu_minimap.xml to menu_mini_map.xml and deleted menu_minimap.xml (translations all have menu_mini_map.xml)	2009-08-29 01:47:33 +00:00
llfloatermap.h	…
llfloatermediabrowser.cpp	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
llfloatermediabrowser.h	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
llfloatermemleak.cpp	…
llfloatermemleak.h	…
llfloaternamedesc.cpp	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llfloaternamedesc.h	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llfloaternotificationsconsole.cpp	merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3	2009-08-24 20:04:52 +00:00
llfloaternotificationsconsole.h	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llfloateropenobject.cpp	svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3	2009-08-26 20:47:27 +00:00
llfloateropenobject.h	…
llfloaterparcel.cpp	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
llfloaterparcel.h	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llfloaterperms.cpp	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llfloaterperms.h	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llfloaterpostcard.cpp	svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3	2009-08-26 20:47:27 +00:00
llfloaterpostcard.h	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llfloaterpostprocess.cpp	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llfloaterpostprocess.h	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llfloaterpreference.cpp	DEV-39441: Removed include for boost/regex.hpp from llstring.h (and	2009-09-09 11:54:23 +00:00
llfloaterpreference.h	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llfloaterproperties.cpp	skinning-22 -> viewer-2 trunk to pick up bug fixes, including crash on script compile when cursor is at the end of the script editor window. Replaced panel_pick_info.xml and panel_profile_view.xml with our versions, which stomped some PE changes. Panels still work, however, and Kurt is still working on layout.	2009-08-28 16:51:34 +00:00
llfloaterproperties.h	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llfloaterregioninfo.cpp	svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3	2009-08-26 20:47:27 +00:00
llfloaterregioninfo.h	…
llfloaterreporter.cpp	svn merge -r 1490-1500 https://svn.aws.productengine.com/secondlife/pe/stable-2	2009-08-28 22:58:17 +00:00
llfloaterreporter.h	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llfloaterscriptdebug.cpp	merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3	2009-08-24 20:04:52 +00:00
llfloaterscriptdebug.h	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llfloatersellland.cpp	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llfloatersellland.h	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llfloatersettingsdebug.cpp	merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3	2009-08-24 20:04:52 +00:00
llfloatersettingsdebug.h	merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3	2009-08-24 20:04:52 +00:00
llfloatersnapshot.cpp	merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1	2009-09-09 01:26:44 +00:00
llfloatersnapshot.h	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llfloatertelehub.cpp	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llfloatertelehub.h	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llfloatertestinspectors.cpp	merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1	2009-09-09 01:26:44 +00:00
llfloatertestinspectors.h	merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1	2009-09-09 01:26:44 +00:00
llfloatertestlistview.cpp	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llfloatertestlistview.h	…
llfloatertools.cpp	DEV-39508 = Show Tools ("Build") menu by default	2009-09-04 23:55:15 +00:00
llfloatertools.h	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llfloatertopobjects.cpp	…
llfloatertopobjects.h	…
llfloatertos.cpp	DEV-38942 Eliminate startModal() from LLModalDialog	2009-08-28 08:04:26 +00:00
llfloatertos.h	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
llfloateruipreview.cpp	merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3	2009-08-24 20:04:52 +00:00
llfloateruipreview.h	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llfloaterurldisplay.cpp	…
llfloaterurldisplay.h	…
llfloaterurlentry.cpp	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
llfloaterurlentry.h	…
llfloatervoicedevicesettings.cpp	svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3	2009-08-26 20:47:27 +00:00
llfloatervoicedevicesettings.h	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llfloaterwater.cpp	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llfloaterwater.h	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llfloaterwindlight.cpp	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llfloaterwindlight.h	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llfloaterworldmap.cpp	merge https://svn.aws.productengine.com/secondlife/export-from-ll@1277 https://svn.aws.productengine.com/secondlife/pe/stable-1@1297 -> viewer-2-0	2009-08-12 01:12:27 +00:00
llfloaterworldmap.h	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llfolderview.cpp	svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3	2009-08-26 20:47:27 +00:00
llfolderview.h	merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3	2009-08-24 20:04:52 +00:00
llfoldervieweventlistener.h	svn merge -r129617:130277 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-5 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-12 19:03:20 +00:00
llfolderviewitem.cpp	svn merge -r 1490-1500 https://svn.aws.productengine.com/secondlife/pe/stable-2	2009-08-28 22:58:17 +00:00
llfolderviewitem.h	svn merge -r 127683:128178 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/folder-links__merge__viewer-2.0.0.3-r127634 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-07-23 23:41:12 +00:00
llfollowcam.cpp	…
llfollowcam.h	…
llfriendcard.cpp	merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1566 https://svn.aws.productengine.com/secondlife/pe/stable-2@1580 -> viewer-2.0.0-3	2009-09-07 22:55:07 +00:00
llfriendcard.h	merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1566 https://svn.aws.productengine.com/secondlife/pe/stable-2@1580 -> viewer-2.0.0-3	2009-09-07 22:55:07 +00:00
llgesturemgr.cpp	Fix for a crash bug on login after clearing the cache.	2009-08-04 23:41:19 +00:00
llgesturemgr.h	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llglsandbox.cpp	merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1	2009-09-09 01:26:44 +00:00
llgroupactions.cpp	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
llgroupactions.h	svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3	2009-08-26 20:47:27 +00:00
llgrouplist.cpp	merge -r 1586-1593 https://svn.aws.productengine.com/secondlife/pe/stable-2 -> viewer-2.0.0-3	2009-09-09 04:27:06 +00:00
llgrouplist.h	merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/indra@1170 https://svn.aws.productengine.com/secondlife/pe/stable-1/indra@1187 -> viewer-2.0.0-3	2009-07-30 23:22:41 +00:00
llgroupmgr.cpp	svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3	2009-08-26 20:47:27 +00:00
llgroupmgr.h	…
llhomelocationresponder.cpp	Merged work for DEV-2066 (and formerly QAR-1538) in Viewer 2.	2009-07-16 17:54:58 +00:00
llhomelocationresponder.h	Merged work for DEV-2066 (and formerly QAR-1538) in Viewer 2.	2009-07-16 17:54:58 +00:00
llhudeffect.cpp	…
llhudeffect.h	…
llhudeffectbeam.cpp	…
llhudeffectbeam.h	…
llhudeffectlookat.cpp	EXT-730 - Crash in LLHUDEffectLookAt::calcTargetPosition	2009-08-26 23:46:04 +00:00
llhudeffectlookat.h	…
llhudeffectpointat.cpp	…
llhudeffectpointat.h	…
llhudeffecttrail.cpp	…
llhudeffecttrail.h	…
llhudicon.cpp	…
llhudicon.h	…
llhudmanager.cpp	merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3	2009-08-24 20:04:52 +00:00
llhudmanager.h	…
llhudobject.cpp	merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3	2009-08-24 20:04:52 +00:00
llhudobject.h	…
llhudrender.cpp	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llhudrender.h	…
llhudtext.cpp	merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3	2009-08-24 20:04:52 +00:00
llhudtext.h	…
llhudview.cpp	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
llhudview.h	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
llimhandler.cpp	svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3	2009-08-26 20:47:27 +00:00
llimpanel.cpp	merge merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1581 https://svn.aws.productengine.com/secondlife/pe/stable-2@1585 -> viewer-2.0.0-3	2009-09-09 04:12:50 +00:00
llimpanel.h	merge merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1581 https://svn.aws.productengine.com/secondlife/pe/stable-2@1585 -> viewer-2.0.0-3	2009-09-09 04:12:50 +00:00
llimview.cpp	merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1	2009-09-09 01:26:44 +00:00
llimview.h	merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1	2009-09-09 01:26:44 +00:00
llinspectavatar.cpp	merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1	2009-09-09 01:26:44 +00:00
llinspectavatar.h	merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1	2009-09-09 01:26:44 +00:00
llinventorybridge.cpp	merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1566 https://svn.aws.productengine.com/secondlife/pe/stable-2@1580 -> viewer-2.0.0-3	2009-09-07 22:55:07 +00:00
llinventorybridge.h	svn merge -r 1490-1500 https://svn.aws.productengine.com/secondlife/pe/stable-2	2009-08-28 22:58:17 +00:00
llinventoryclipboard.cpp	…
llinventoryclipboard.h	…
llinventoryfilter.cpp	EXT-614 Object inventory does not update to show inventory created or placed in the object.	2009-08-29 01:08:39 +00:00
llinventoryfilter.h	svn merge -r129617:130277 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-5 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-12 19:03:20 +00:00
llinventorymodel.cpp	merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1516 https://svn.aws.productengine.com/secondlife/pe/stable-2@1526 -> viewer-2.0.0-3	2009-09-02 02:59:07 +00:00
llinventorymodel.h	For DEV-34223: Avatar Pipeline Project - M6 (Current Outfit Folder). Make sure that only wearables from the COF are handled as wearables during initial COF load. Added error checking for null asset IDs. This fixes a crash on login observed after loading from COF was enabled.	2009-08-18 20:18:40 +00:00
lljoystickbutton.cpp	…
lljoystickbutton.h	…
lllandmarkactions.cpp	svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1480 https://svn.aws.productengine.com/secondlife/pe/stable-2@1489 -> viewer-2.0.0-3	2009-08-28 22:30:09 +00:00
lllandmarkactions.h	svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3	2009-08-26 20:47:27 +00:00
lllandmarklist.cpp	…
lllandmarklist.h	…
lllightconstants.h	…
lllistbrowser.cpp	…
lllistbrowser.h	…
lllistview.cpp	Merge skinning-15 to viewer-2. Fixes include:	2009-07-14 19:06:17 +00:00
lllistview.h	…
lllocaltextureobject.cpp	…
lllocaltextureobject.h	…
lllocationhistory.cpp	merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1566 https://svn.aws.productengine.com/secondlife/pe/stable-2@1580 -> viewer-2.0.0-3	2009-09-07 22:55:07 +00:00
lllocationhistory.h	merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1566 https://svn.aws.productengine.com/secondlife/pe/stable-2@1580 -> viewer-2.0.0-3	2009-09-07 22:55:07 +00:00
lllocationinputctrl.cpp	merge -r 1586-1593 https://svn.aws.productengine.com/secondlife/pe/stable-2 -> viewer-2.0.0-3	2009-09-09 04:27:06 +00:00
lllocationinputctrl.h	merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1	2009-09-09 01:26:44 +00:00
lllogchat.cpp	…
lllogchat.h	…
llloginhandler.cpp	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
llloginhandler.h	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
lllookshistorypanel.h	svn merge -r129617:130277 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-5 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-12 19:03:20 +00:00
llmanip.cpp	…
llmanip.h	…
llmaniprotate.cpp	merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1	2009-09-09 01:26:44 +00:00
llmaniprotate.h	…
llmanipscale.cpp	…
llmanipscale.h	…
llmaniptranslate.cpp	merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1	2009-09-09 01:26:44 +00:00
llmaniptranslate.h	…
llmediactrl.cpp	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
llmediactrl.h	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
llmemoryview.cpp	merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1	2009-09-09 01:26:44 +00:00
llmemoryview.h	…
llmenucommands.cpp	svn merge -r 1490-1500 https://svn.aws.productengine.com/secondlife/pe/stable-2	2009-08-28 22:58:17 +00:00
llmenucommands.h	…
llmetricperformancetester.cpp	…
llmetricperformancetester.h	…
llmimetypes.cpp	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
llmimetypes.h	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
llmorphview.cpp	…
llmorphview.h	…
llmoveview.cpp	svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3	2009-08-26 20:47:27 +00:00
llmoveview.h	svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3	2009-08-26 20:47:27 +00:00
llmutelist.cpp	…
llmutelist.h	…
llnamebox.cpp	svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3	2009-08-26 20:47:27 +00:00
llnamebox.h	…
llnameeditor.cpp	svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3	2009-08-26 20:47:27 +00:00
llnameeditor.h	Merged skinning-17 into viewer-2 for bug fixes. Commented out new IM window for now, not complete.	2009-07-27 17:56:26 +00:00
llnamelistctrl.cpp	Merging the SLURLs Everywhere branch (viewer-2.0.0-slurls-3) into	2009-09-04 12:11:27 +00:00
llnamelistctrl.h	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llnavigationbar.cpp	merge -r 1609-1612 https://svn.aws.productengine.com/secondlife/pe/stable-2 -> viewer-2.0.0-3	2009-09-10 03:12:12 +00:00
llnavigationbar.h	merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1566 https://svn.aws.productengine.com/secondlife/pe/stable-2@1580 -> viewer-2.0.0-3	2009-09-07 22:55:07 +00:00
llnearbychat.cpp	merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1516 https://svn.aws.productengine.com/secondlife/pe/stable-2@1526 -> viewer-2.0.0-3	2009-09-02 02:59:07 +00:00
llnearbychat.h	merge https://svn.aws.productengine.com/secondlife/export-from-ll@1277 https://svn.aws.productengine.com/secondlife/pe/stable-1@1297 -> viewer-2-0	2009-08-12 01:12:27 +00:00
llnearbychatbar.cpp	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
llnearbychatbar.h	merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3	2009-08-24 20:04:52 +00:00
llnearbychathandler.cpp	svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3	2009-08-26 20:47:27 +00:00
llnearbychathandler.h	svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3	2009-08-26 20:47:27 +00:00
llnetmap.cpp	merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1	2009-09-09 01:26:44 +00:00
llnetmap.h	merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1	2009-09-09 01:26:44 +00:00
llnotificationalerthandler.cpp	svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3	2009-08-26 20:47:27 +00:00
llnotificationgrouphandler.cpp	svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3	2009-08-26 20:47:27 +00:00
llnotificationhandler.h	svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3	2009-08-26 20:47:27 +00:00
llnotificationmanager.cpp	svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3	2009-08-26 20:47:27 +00:00
llnotificationmanager.h	merge https://svn.aws.productengine.com/secondlife/pe/stable-1/indra -r 1078-1091 -> viewer-2.0.0-3	2009-07-21 00:59:14 +00:00
lloutputmonitorctrl.cpp	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
lloutputmonitorctrl.h	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
lloverlaybar.cpp	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
lloverlaybar.h	merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/indra@1170 https://svn.aws.productengine.com/secondlife/pe/stable-1/indra@1187 -> viewer-2.0.0-3	2009-07-30 23:22:41 +00:00
llpanelappearancetab.h	svn merge -r129617:130277 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-5 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-12 19:03:20 +00:00
llpanelavatar.cpp	merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1602 https://svn.aws.productengine.com/secondlife/pe/stable-2@1608 -> viewer-2.0.0-3	2009-09-10 03:08:54 +00:00
llpanelavatar.h	merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1566 https://svn.aws.productengine.com/secondlife/pe/stable-2@1580 -> viewer-2.0.0-3	2009-09-07 22:55:07 +00:00
llpanelavatartag.cpp	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llpanelavatartag.h	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llpanelblockedlist.cpp	merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1566 https://svn.aws.productengine.com/secondlife/pe/stable-2@1580 -> viewer-2.0.0-3	2009-09-07 22:55:07 +00:00
llpanelblockedlist.h	merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1566 https://svn.aws.productengine.com/secondlife/pe/stable-2@1580 -> viewer-2.0.0-3	2009-09-07 22:55:07 +00:00
llpanelclassified.cpp	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
llpanelclassified.h	…
llpanelcontents.cpp	…
llpanelcontents.h	…
llpanelface.cpp	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
llpanelface.h	…
llpanelgroup.cpp	merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1516 https://svn.aws.productengine.com/secondlife/pe/stable-2@1526 -> viewer-2.0.0-3	2009-09-02 02:59:07 +00:00
llpanelgroup.h	svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1480 https://svn.aws.productengine.com/secondlife/pe/stable-2@1489 -> viewer-2.0.0-3	2009-08-28 22:30:09 +00:00
llpanelgroupgeneral.cpp	Merging the SLURLs Everywhere branch (viewer-2.0.0-slurls-3) into	2009-09-04 12:11:27 +00:00
llpanelgroupgeneral.h	svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1480 https://svn.aws.productengine.com/secondlife/pe/stable-2@1489 -> viewer-2.0.0-3	2009-08-28 22:30:09 +00:00
llpanelgroupinvite.cpp	svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3	2009-08-26 20:47:27 +00:00
llpanelgroupinvite.h	…
llpanelgrouplandmoney.cpp	svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3	2009-08-26 20:47:27 +00:00
llpanelgrouplandmoney.h	merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3	2009-08-24 20:04:52 +00:00
llpanelgroupnotices.cpp	svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3	2009-08-26 20:47:27 +00:00
llpanelgroupnotices.h	svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3	2009-08-26 20:47:27 +00:00
llpanelgrouproles.cpp	Merging the SLURLs Everywhere branch (viewer-2.0.0-slurls-3) into	2009-09-04 12:11:27 +00:00
llpanelgrouproles.h	svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3	2009-08-26 20:47:27 +00:00
llpanelimcontrolpanel.cpp	EXT-580 Add Friend button in the IM floater not disabled if already friends	2009-08-20 00:21:14 +00:00
llpanelimcontrolpanel.h	merge -r 130196-130356 skinning-20 -> viewer-2.0.0-3	2009-08-13 04:40:19 +00:00
llpanelland.cpp	…
llpanelland.h	…
llpanellandaudio.cpp	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
llpanellandaudio.h	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
llpanellandmarks.cpp	svn merge -r 1490-1500 https://svn.aws.productengine.com/secondlife/pe/stable-2	2009-08-28 22:58:17 +00:00
llpanellandmarks.h	svn merge -r 1490-1500 https://svn.aws.productengine.com/secondlife/pe/stable-2	2009-08-28 22:58:17 +00:00
llpanellandmedia.cpp	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
llpanellandmedia.h	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
llpanellogin.cpp	DEV-38942 Eliminate startModal() from LLModalDialog	2009-08-28 08:04:26 +00:00
llpanellogin.h	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
llpanelobject.cpp	…
llpanelobject.h	…
llpanelpeople.cpp	merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1566 https://svn.aws.productengine.com/secondlife/pe/stable-2@1580 -> viewer-2.0.0-3	2009-09-07 22:55:07 +00:00
llpanelpeople.h	svn merge -r 1490-1500 https://svn.aws.productengine.com/secondlife/pe/stable-2	2009-08-28 22:58:17 +00:00
llpanelpermissions.cpp	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
llpanelpermissions.h	…
llpanelpick.cpp	merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1602 https://svn.aws.productengine.com/secondlife/pe/stable-2@1608 -> viewer-2.0.0-3	2009-09-10 03:08:54 +00:00
llpanelpick.h	svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3	2009-08-26 20:47:27 +00:00
llpanelpicks.cpp	merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1	2009-09-09 01:26:44 +00:00
llpanelpicks.h	merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1566 https://svn.aws.productengine.com/secondlife/pe/stable-2@1580 -> viewer-2.0.0-3	2009-09-07 22:55:07 +00:00
llpanelplace.cpp	merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3	2009-08-24 20:04:52 +00:00
llpanelplace.h	…
llpanelplaceinfo.cpp	merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1	2009-09-09 01:26:44 +00:00
llpanelplaceinfo.h	merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1566 https://svn.aws.productengine.com/secondlife/pe/stable-2@1580 -> viewer-2.0.0-3	2009-09-07 22:55:07 +00:00
llpanelplaces.cpp	merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1566 https://svn.aws.productengine.com/secondlife/pe/stable-2@1580 -> viewer-2.0.0-3	2009-09-07 22:55:07 +00:00
llpanelplaces.h	merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1516 https://svn.aws.productengine.com/secondlife/pe/stable-2@1526 -> viewer-2.0.0-3	2009-09-02 02:59:07 +00:00
llpanelplacestab.cpp	merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/indra@1170 https://svn.aws.productengine.com/secondlife/pe/stable-1/indra@1187 -> viewer-2.0.0-3	2009-07-30 23:22:41 +00:00
llpanelplacestab.h	merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/indra@1170 https://svn.aws.productengine.com/secondlife/pe/stable-1/indra@1187 -> viewer-2.0.0-3	2009-07-30 23:22:41 +00:00
llpanelprofile.cpp	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
llpanelprofile.h	merge -r 1341-1350 https://svn.aws.productengine.com/secondlife/pe/stable-1 -> viewer-2.0.0-3	2009-08-14 22:40:13 +00:00
llpanelprofileview.cpp	merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1516 https://svn.aws.productengine.com/secondlife/pe/stable-2@1526 -> viewer-2.0.0-3	2009-09-02 02:59:07 +00:00
llpanelprofileview.h	merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1516 https://svn.aws.productengine.com/secondlife/pe/stable-2@1526 -> viewer-2.0.0-3	2009-09-02 02:59:07 +00:00
llpanelteleporthistory.cpp	merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1566 https://svn.aws.productengine.com/secondlife/pe/stable-2@1580 -> viewer-2.0.0-3	2009-09-07 22:55:07 +00:00
llpanelteleporthistory.h	merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1566 https://svn.aws.productengine.com/secondlife/pe/stable-2@1580 -> viewer-2.0.0-3	2009-09-07 22:55:07 +00:00
llpanelvolume.cpp	svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3	2009-08-26 20:47:27 +00:00
llpanelvolume.h	…
llparcelselection.cpp	…
llparcelselection.h	…
llpatchvertexarray.cpp	…
llpatchvertexarray.h	…
llpolymesh.cpp	…
llpolymesh.h	…
llpolymorph.cpp	…
llpolymorph.h	…
llpreview.cpp	svn merge -r 1490-1500 https://svn.aws.productengine.com/secondlife/pe/stable-2	2009-08-28 22:58:17 +00:00
llpreview.h	…
llpreviewanim.cpp	svn merge -r 1490-1500 https://svn.aws.productengine.com/secondlife/pe/stable-2	2009-08-28 22:58:17 +00:00
llpreviewanim.h	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llpreviewgesture.cpp	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llpreviewgesture.h	svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-04 01:12:59 +00:00
llpreviewnotecard.cpp	Merging the SLURLs Everywhere branch (viewer-2.0.0-slurls-3) into	2009-09-04 12:11:27 +00:00
llpreviewnotecard.h	DEV-35969 - notecards opened from object inventory are blank	2009-08-11 00:47:46 +00:00
llpreviewscript.cpp	Partial merge of: viewer-2.0.0-3@131138 texture-pipeline-3@131862 -> viewer-2.0.0-3	2009-08-29 06:23:41 +00:00
llpreviewscript.h	…
llpreviewsound.cpp	svn merge -r 1490-1500 https://svn.aws.productengine.com/secondlife/pe/stable-2	2009-08-28 22:58:17 +00:00
llpreviewsound.h	…
llpreviewtexture.cpp	svn merge -r 1490-1500 https://svn.aws.productengine.com/secondlife/pe/stable-2	2009-08-28 22:58:17 +00:00
llpreviewtexture.h	…
llproductinforequest.cpp	…
llproductinforequest.h	…
llprogressview.cpp	Merging the SLURLs Everywhere branch (viewer-2.0.0-slurls-3) into	2009-09-04 12:11:27 +00:00
llprogressview.h	Merging the SLURLs Everywhere branch (viewer-2.0.0-slurls-3) into	2009-09-04 12:11:27 +00:00
llrecentpeople.cpp	…
llrecentpeople.h	…
llregionposition.cpp	…
llregionposition.h	…
llremoteparcelrequest.cpp	…
llremoteparcelrequest.h	…
llresourcedata.h	…
llrootview.h	…
llsavedsettingsglue.cpp	…
llsavedsettingsglue.h	…
llscreenchannel.cpp	merge -r 1609-1612 https://svn.aws.productengine.com/secondlife/pe/stable-2 -> viewer-2.0.0-3	2009-09-10 03:12:12 +00:00
llscreenchannel.h	svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3	2009-08-26 20:47:27 +00:00
llsearchcombobox.cpp	merge -r 1609-1612 https://svn.aws.productengine.com/secondlife/pe/stable-2 -> viewer-2.0.0-3	2009-09-10 03:12:12 +00:00
llsearchcombobox.h	merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1566 https://svn.aws.productengine.com/secondlife/pe/stable-2@1580 -> viewer-2.0.0-3	2009-09-07 22:55:07 +00:00
llsearchhistory.cpp	merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1566 https://svn.aws.productengine.com/secondlife/pe/stable-2@1580 -> viewer-2.0.0-3	2009-09-07 22:55:07 +00:00
llsearchhistory.h	merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1566 https://svn.aws.productengine.com/secondlife/pe/stable-2@1580 -> viewer-2.0.0-3	2009-09-07 22:55:07 +00:00
llselectmgr.cpp	merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1	2009-09-09 01:26:44 +00:00
llselectmgr.h	merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1	2009-09-09 01:26:44 +00:00
llsidetray.cpp	merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1566 https://svn.aws.productengine.com/secondlife/pe/stable-2@1580 -> viewer-2.0.0-3	2009-09-07 22:55:07 +00:00
llsidetray.h	svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1480 https://svn.aws.productengine.com/secondlife/pe/stable-2@1489 -> viewer-2.0.0-3	2009-08-28 22:30:09 +00:00
llsidetraypanelcontainer.cpp	svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3	2009-08-26 20:47:27 +00:00
llsidetraypanelcontainer.h	merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1211 https://svn.aws.productengine.com/secondlife/pe/stable-1@1228 -> viewer-2.0.0-3	2009-08-03 22:25:48 +00:00
llsky.cpp	svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3	2009-08-26 20:47:27 +00:00
llsky.h	…
llslurl.cpp	svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3	2009-08-26 20:47:27 +00:00
llslurl.h	svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3	2009-08-26 20:47:27 +00:00
llspatialpartition.cpp	svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3	2009-08-26 20:47:27 +00:00
llspatialpartition.h	…
llsplitbutton.cpp	merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1211 https://svn.aws.productengine.com/secondlife/pe/stable-1@1228 -> viewer-2.0.0-3	2009-08-03 22:25:48 +00:00
llsplitbutton.h	merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1211 https://svn.aws.productengine.com/secondlife/pe/stable-1@1228 -> viewer-2.0.0-3	2009-08-03 22:25:48 +00:00
llsprite.cpp	…
llsprite.h	…
llsrv.cpp	…
llsrv.h	…
llstartup.cpp	merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1566 https://svn.aws.productengine.com/secondlife/pe/stable-2@1580 -> viewer-2.0.0-3	2009-09-07 22:55:07 +00:00
llstartup.h	…
llstatusbar.cpp	svn merge -r 1490-1500 https://svn.aws.productengine.com/secondlife/pe/stable-2	2009-08-28 22:58:17 +00:00
llstatusbar.h	svn merge -r 1490-1500 https://svn.aws.productengine.com/secondlife/pe/stable-2	2009-08-28 22:58:17 +00:00
llstylemap.cpp	merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3	2009-08-24 20:04:52 +00:00
llstylemap.h	merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3	2009-08-24 20:04:52 +00:00
llsurface.cpp	…
llsurface.h	…
llsurfacepatch.cpp	…
llsurfacepatch.h	…
llsyswellitem.cpp	svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1331 https://svn.aws.productengine.com/secondlife/pe/stable-1@1340 -> viewer-2.0.0-3	2009-08-14 21:50:02 +00:00
llsyswellitem.h	merge https://svn.aws.productengine.com/secondlife/export-from-ll@1277 https://svn.aws.productengine.com/secondlife/pe/stable-1@1297 -> viewer-2-0	2009-08-12 01:12:27 +00:00
llsyswellwindow.cpp	merge -r 1586-1593 https://svn.aws.productengine.com/secondlife/pe/stable-2 -> viewer-2.0.0-3	2009-09-09 04:27:06 +00:00
llsyswellwindow.h	merge -r 1586-1593 https://svn.aws.productengine.com/secondlife/pe/stable-2 -> viewer-2.0.0-3	2009-09-09 04:27:06 +00:00
lltable.h	…
llteleporthistory.cpp	svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1480 https://svn.aws.productengine.com/secondlife/pe/stable-2@1489 -> viewer-2.0.0-3	2009-08-28 22:30:09 +00:00
llteleporthistory.h	svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1480 https://svn.aws.productengine.com/secondlife/pe/stable-2@1489 -> viewer-2.0.0-3	2009-08-28 22:30:09 +00:00
llteleporthistorystorage.cpp	merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1566 https://svn.aws.productengine.com/secondlife/pe/stable-2@1580 -> viewer-2.0.0-3	2009-09-07 22:55:07 +00:00
llteleporthistorystorage.h	merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1566 https://svn.aws.productengine.com/secondlife/pe/stable-2@1580 -> viewer-2.0.0-3	2009-09-07 22:55:07 +00:00
lltexglobalcolor.cpp	…
lltexglobalcolor.h	…
lltexlayer.cpp	…
lltexlayer.h	…
lltexlayerparams.cpp	…
lltexlayerparams.h	…
lltexturecache.cpp	…
lltexturecache.h	…
lltexturectrl.cpp	svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1480 https://svn.aws.productengine.com/secondlife/pe/stable-2@1489 -> viewer-2.0.0-3	2009-08-28 22:30:09 +00:00
lltexturectrl.h	Merged skinning-17 into viewer-2 for bug fixes. Commented out new IM window for now, not complete.	2009-07-27 17:56:26 +00:00
lltexturefetch.cpp	…
lltexturefetch.h	…
lltextureview.cpp	merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1	2009-09-09 01:26:44 +00:00
lltextureview.h	…
lltoast.cpp	merge -r 1609-1612 https://svn.aws.productengine.com/secondlife/pe/stable-2 -> viewer-2.0.0-3	2009-09-10 03:12:12 +00:00
lltoast.h	merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1566 https://svn.aws.productengine.com/secondlife/pe/stable-2@1580 -> viewer-2.0.0-3	2009-09-07 22:55:07 +00:00
lltoastalertpanel.cpp	svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3	2009-08-26 20:47:27 +00:00
lltoastalertpanel.h	svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3	2009-08-26 20:47:27 +00:00
lltoastgroupnotifypanel.cpp	merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1566 https://svn.aws.productengine.com/secondlife/pe/stable-2@1580 -> viewer-2.0.0-3	2009-09-07 22:55:07 +00:00
lltoastgroupnotifypanel.h	merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1566 https://svn.aws.productengine.com/secondlife/pe/stable-2@1580 -> viewer-2.0.0-3	2009-09-07 22:55:07 +00:00
lltoastimpanel.cpp	merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1566 https://svn.aws.productengine.com/secondlife/pe/stable-2@1580 -> viewer-2.0.0-3	2009-09-07 22:55:07 +00:00
lltoastimpanel.h	merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1566 https://svn.aws.productengine.com/secondlife/pe/stable-2@1580 -> viewer-2.0.0-3	2009-09-07 22:55:07 +00:00
lltoastnotifypanel.cpp	merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3	2009-08-24 20:04:52 +00:00
lltoastnotifypanel.h	merge https://svn.aws.productengine.com/secondlife/pe/stable-1/indra -r 1078-1091 -> viewer-2.0.0-3	2009-07-21 00:59:14 +00:00
lltoastpanel.cpp	merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1566 https://svn.aws.productengine.com/secondlife/pe/stable-2@1580 -> viewer-2.0.0-3	2009-09-07 22:55:07 +00:00
lltoastpanel.h	merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1566 https://svn.aws.productengine.com/secondlife/pe/stable-2@1580 -> viewer-2.0.0-3	2009-09-07 22:55:07 +00:00
lltool.cpp	merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1	2009-09-09 01:26:44 +00:00
lltool.h	merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1	2009-09-09 01:26:44 +00:00
lltoolbar.cpp	merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1566 https://svn.aws.productengine.com/secondlife/pe/stable-2@1580 -> viewer-2.0.0-3	2009-09-07 22:55:07 +00:00
lltoolbar.h	…
lltoolbrush.cpp	…
lltoolbrush.h	…
lltoolcomp.cpp	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
lltoolcomp.h	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
lltooldraganddrop.cpp	merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1	2009-09-09 01:26:44 +00:00
lltooldraganddrop.h	merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1	2009-09-09 01:26:44 +00:00
lltoolface.cpp	svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3	2009-08-26 20:47:27 +00:00
lltoolface.h	…
lltoolfocus.cpp	merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1	2009-09-09 01:26:44 +00:00
lltoolfocus.h	…
lltoolgrab.cpp	merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1	2009-09-09 01:26:44 +00:00
lltoolgrab.h	…
lltoolgun.cpp	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
lltoolgun.h	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
lltoolindividual.cpp	…
lltoolindividual.h	…
lltoolmgr.cpp	DEV-39508 = Show Tools ("Build") menu by default	2009-09-04 23:55:15 +00:00
lltoolmgr.h	…
lltoolmorph.cpp	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
lltoolmorph.h	…
lltoolobjpicker.cpp	…
lltoolobjpicker.h	…
lltoolpie.cpp	merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1	2009-09-09 01:26:44 +00:00
lltoolpie.h	merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1	2009-09-09 01:26:44 +00:00
lltoolpipette.cpp	merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1	2009-09-09 01:26:44 +00:00
lltoolpipette.h	merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1	2009-09-09 01:26:44 +00:00
lltoolplacer.cpp	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
lltoolplacer.h	…
lltoolselect.cpp	…
lltoolselect.h	…
lltoolselectland.cpp	svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3	2009-08-26 20:47:27 +00:00
lltoolselectland.h	…
lltoolselectrect.cpp	…
lltoolselectrect.h	…
lltoolview.cpp	…
lltoolview.h	…
lltracker.cpp	…
lltracker.h	…
lluiconstants.h	…
lluploaddialog.cpp	…
lluploaddialog.h	…
llurl.cpp	…
llurl.h	…
llurldispatcher.cpp	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
llurldispatcher.h	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
llurlhistory.cpp	…
llurlhistory.h	…
llurllineeditorctrl.cpp	merge https://svn.aws.productengine.com/secondlife/export-from-ll@1277 https://svn.aws.productengine.com/secondlife/pe/stable-1@1297 -> viewer-2-0	2009-08-12 01:12:27 +00:00
llurllineeditorctrl.h	merge https://svn.aws.productengine.com/secondlife/export-from-ll@1277 https://svn.aws.productengine.com/secondlife/pe/stable-1@1297 -> viewer-2-0	2009-08-12 01:12:27 +00:00
llurlwhitelist.cpp	…
llurlwhitelist.h	…
llvectorperfoptions.cpp	…
llvectorperfoptions.h	…
llviewchildren.cpp	…
llviewchildren.h	…
llviewerassetstorage.cpp	…
llviewerassetstorage.h	Merged work for DEV-2066 (and formerly QAR-1538) in Viewer 2.	2009-07-16 17:54:58 +00:00
llvieweraudio.cpp	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
llvieweraudio.h	…
llviewercamera.cpp	…
llviewercamera.h	…
llviewercontrol.cpp	EXT-791 - Add "Pause Agent" option to the Debug > Network menu	2009-09-01 01:03:51 +00:00
llviewercontrol.h	…
llviewerdisplay.cpp	merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1	2009-09-09 01:26:44 +00:00
llviewerdisplay.h	…
llviewerfloaterreg.cpp	merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1	2009-09-09 01:26:44 +00:00
llviewerfloaterreg.h	…
llviewergenericmessage.cpp	…
llviewergenericmessage.h	…
llviewergesture.cpp	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
llviewergesture.h	…
llviewerinventory.cpp	merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1566 https://svn.aws.productengine.com/secondlife/pe/stable-2@1580 -> viewer-2.0.0-3	2009-09-07 22:55:07 +00:00
llviewerinventory.h	merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1566 https://svn.aws.productengine.com/secondlife/pe/stable-2@1580 -> viewer-2.0.0-3	2009-09-07 22:55:07 +00:00
llviewerjoint.cpp	…
llviewerjoint.h	…
llviewerjointattachment.cpp	…
llviewerjointattachment.h	…
llviewerjointmesh.cpp	svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3	2009-08-26 20:47:27 +00:00
llviewerjointmesh.h	Merged work for DEV-2066 (and formerly QAR-1538) in Viewer 2.	2009-07-16 17:54:58 +00:00
llviewerjointmesh_sse.cpp	…
llviewerjointmesh_sse2.cpp	…
llviewerjointmesh_vec.cpp	…
llviewerjoystick.cpp	…
llviewerjoystick.h	…
llviewerkeyboard.cpp	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
llviewerkeyboard.h	…
llviewerlayer.cpp	…
llviewerlayer.h	…
llviewermedia.cpp	merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1	2009-09-09 01:26:44 +00:00
llviewermedia.h	merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1	2009-09-09 01:26:44 +00:00
llviewermedia_streamingaudio.cpp	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
llviewermedia_streamingaudio.h	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
llviewermediafocus.cpp	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
llviewermediafocus.h	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
llviewermediaobserver.h	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
llviewermenu.cpp	merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1	2009-09-09 01:26:44 +00:00
llviewermenu.h	EXT-260 - I18N: the term 'Geek' is hard to translate	2009-08-11 01:34:57 +00:00
llviewermenufile.cpp	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
llviewermenufile.h	…
llviewermessage.cpp	merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1566 https://svn.aws.productengine.com/secondlife/pe/stable-2@1580 -> viewer-2.0.0-3	2009-09-07 22:55:07 +00:00
llviewermessage.h	…
llviewernetwork.cpp	…
llviewernetwork.h	…
llviewerobject.cpp	merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1	2009-09-09 01:26:44 +00:00
llviewerobject.h	merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1	2009-09-09 01:26:44 +00:00
llviewerobjectlist.cpp	merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1	2009-09-09 01:26:44 +00:00
llviewerobjectlist.h	…
llviewerparcelmedia.cpp	merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1	2009-09-09 01:26:44 +00:00
llviewerparcelmedia.h	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
llviewerparcelmediaautoplay.cpp	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
llviewerparcelmediaautoplay.h	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
llviewerparcelmgr.cpp	merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1	2009-09-09 01:26:44 +00:00
llviewerparcelmgr.h	merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1	2009-09-09 01:26:44 +00:00
llviewerparceloverlay.cpp	…
llviewerparceloverlay.h	…
llviewerpartsim.cpp	merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3	2009-08-24 20:04:52 +00:00
llviewerpartsim.h	…
llviewerpartsource.cpp	…
llviewerpartsource.h	…
llviewerprecompiledheaders.cpp	…
llviewerprecompiledheaders.h	Partial merge of: viewer-2.0.0-3@131138 texture-pipeline-3@131862 -> viewer-2.0.0-3	2009-08-29 06:23:41 +00:00
llviewerregion.cpp	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
llviewerregion.h	…
llviewershadermgr.cpp	…
llviewershadermgr.h	…
llviewerstats.cpp	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
llviewerstats.h	…
llviewertexteditor.cpp	merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1	2009-09-09 01:26:44 +00:00
llviewertexteditor.h	merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1	2009-09-09 01:26:44 +00:00
llviewertexture.cpp	merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1	2009-09-09 01:26:44 +00:00
llviewertexture.h	…
llviewertextureanim.cpp	…
llviewertextureanim.h	…
llviewertexturelist.cpp	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
llviewertexturelist.h	…
llviewerthrottle.cpp	…
llviewerthrottle.h	…
llviewervisualparam.cpp	…
llviewervisualparam.h	…
llviewerwindow.cpp	merge -r 1586-1593 https://svn.aws.productengine.com/secondlife/pe/stable-2 -> viewer-2.0.0-3	2009-09-09 04:27:06 +00:00
llviewerwindow.h	merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1	2009-09-09 01:26:44 +00:00
llvlcomposition.cpp	…
llvlcomposition.h	…
llvlmanager.cpp	svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3	2009-08-26 20:47:27 +00:00
llvlmanager.h	…
llvoavatar.cpp	svn merge -r 1490-1500 https://svn.aws.productengine.com/secondlife/pe/stable-2	2009-08-28 22:58:17 +00:00
llvoavatar.h	EXT-730 - Crash in LLHUDEffectLookAt::calcTargetPosition	2009-08-26 23:46:04 +00:00
llvoavatardefines.cpp	…
llvoavatardefines.h	…
llvoavatarself.cpp	svn merge -r 1490-1500 https://svn.aws.productengine.com/secondlife/pe/stable-2	2009-08-28 22:58:17 +00:00
llvoavatarself.h	svn merge -r130469:130817 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-6 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-08-18 15:34:09 +00:00
llvocache.cpp	…
llvocache.h	…
llvoclouds.cpp	merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3	2009-08-24 20:04:52 +00:00
llvoclouds.h	…
llvograss.cpp	merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1	2009-09-09 01:26:44 +00:00
llvograss.h	…
llvoground.cpp	svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3	2009-08-26 20:47:27 +00:00
llvoground.h	…
llvoiceclient.cpp	merge https://svn.aws.productengine.com/secondlife/export-from-ll@1277 https://svn.aws.productengine.com/secondlife/pe/stable-1@1297 -> viewer-2-0	2009-08-12 01:12:27 +00:00
llvoiceclient.h	merge https://svn.aws.productengine.com/secondlife/export-from-ll@1277 https://svn.aws.productengine.com/secondlife/pe/stable-1@1297 -> viewer-2-0	2009-08-12 01:12:27 +00:00
llvoicevisualizer.cpp	…
llvoicevisualizer.h	…
llvoinventorylistener.cpp	…
llvoinventorylistener.h	…
llvopartgroup.cpp	merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3	2009-08-24 20:04:52 +00:00
llvopartgroup.h	…
llvosky.cpp	merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3	2009-08-24 20:04:52 +00:00
llvosky.h	…
llvosurfacepatch.cpp	merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3	2009-08-24 20:04:52 +00:00
llvosurfacepatch.h	…
llvotextbubble.cpp	svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3	2009-08-26 20:47:27 +00:00
llvotextbubble.h	…
llvotree.cpp	merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3	2009-08-24 20:04:52 +00:00
llvotree.h	…
llvotreenew.h	…
llvovolume.cpp	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
llvovolume.h	…
llvowater.cpp	svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3	2009-08-26 20:47:27 +00:00
llvowater.h	…
llvowlsky.cpp	merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3	2009-08-24 20:04:52 +00:00
llvowlsky.h	…
llwatchdog.cpp	…
llwatchdog.h	Merged work for DEV-2066 (and formerly QAR-1538) in Viewer 2.	2009-07-16 17:54:58 +00:00
llwaterparammanager.cpp	merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3	2009-08-24 20:04:52 +00:00
llwaterparammanager.h	…
llwaterparamset.cpp	…
llwaterparamset.h	…
llwearable.cpp	…
llwearable.h	…
llwearablelist.cpp	…
llwearablelist.h	…
llweb.cpp	Merging the SLURLs Everywhere branch (viewer-2.0.0-slurls-3) into	2009-09-04 12:11:27 +00:00
llweb.h	Merging the SLURLs Everywhere branch (viewer-2.0.0-slurls-3) into	2009-09-04 12:11:27 +00:00
llwind.cpp	svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3	2009-08-26 20:47:27 +00:00
llwind.h	…
llwindebug.cpp	…
llwindebug.h	…
llwlanimator.cpp	…
llwlanimator.h	…
llwldaycycle.cpp	…
llwldaycycle.h	…
llwlparammanager.cpp	svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3	2009-08-26 20:47:27 +00:00
llwlparammanager.h	…
llwlparamset.cpp	…
llwlparamset.h	…
llworld.cpp	…
llworld.h	…
llworldmap.cpp	…
llworldmap.h	…
llworldmapview.cpp	merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1	2009-09-09 01:26:44 +00:00
llworldmapview.h	merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1	2009-09-09 01:26:44 +00:00
llxmlrpctransaction.cpp	…
llxmlrpctransaction.h	…
macmain.h	…
macutil_Prefix.h	…
macview.r	…
macview_Prefix.h	merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1211 https://svn.aws.productengine.com/secondlife/pe/stable-1@1228 -> viewer-2.0.0-3	2009-08-03 22:25:48 +00:00
noise.cpp	…
noise.h	…
pipeline.cpp	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
pipeline.h	merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3	2009-08-24 20:04:52 +00:00
secondlife-i686.supp	…
secondlife.icns	…
secondlife_firstlook.icns	…
viewer_manifest.py	svn merge -r132705:132723 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3-stable	2009-09-07 07:56:10 +00:00