livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
phoenix-firestorm/indra/newview
History
Steven Bennetts f05df68656 merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3 
* Bugs: EXT-1111 EXT-915 EXT-1131 EXT-1200 EXT-1202 EXT-1201 EXT-1205 EXT-1212 EXT-1173 EXT-1229 EXT-1218 EXT-1164 EXT-996 EXT-821 EXT-1030 EXT-1031 EXT-816
* Major Bugs: EXT-1142 (timeout during login due to processing group IMs)
* Changes: EXT-1216 (minimize message well)
 		2009-10-01 17:44:44 +00:00
..
English.lproj merge -r 889-936 https://svn.aws.productengine.com/secondlife/pe/stable/ -> viewer-2-0 2009-07-08 05:19:19 +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 svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 2009-10-01 02:35:53 +00:00
character merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +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
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 DEV-39949 Normalize fonts across systems 2009-09-14 21:36:04 +00:00
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 merge -r 889-936 https://svn.aws.productengine.com/secondlife/pe/stable/ -> viewer-2-0 2009-07-08 05:19:19 +00:00
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 https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3 2009-10-01 17:44:44 +00:00
tests DEV-35039 Viewer 2.0 Help System - Viewer Development 2009-09-30 17:46:31 +00:00
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 svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 2009-10-01 02:35:53 +00:00
Info-SecondLife.plist merge -r 889-936 https://svn.aws.productengine.com/secondlife/pe/stable/ -> viewer-2-0 2009-07-08 05:19:19 +00:00
Info-SecondLifeVorbis.plist Print done when done. 2007-01-02 08:33:20 +00:00
VertexCache.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
ViewerInstall.cmake This is causing open source build problems - cherrypicked DEV-29644 VWR-12587: Cmake install target has a hard coded secondlife-bin reference remaining 2009-04-09 21:36:21 +00:00
VorbisFramework.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
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 QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergeme 2009-02-03 17:56: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 -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
gpu_table.txt Merging render-pipeline-6-qa-2 into viewer-2 2009-09-22 11:11:45 +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 QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render-9) and QAR-1236 (dll-msvcrt-2) 2009-02-18 21:10:16 +00:00
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 merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
llagentaccess.h merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
llagentdata.cpp Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llagentdata.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llagentlanguage.cpp Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llagentlanguage.h merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
llagentpilot.cpp merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
llagentpilot.h merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
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 Syncing latest appearance work from avatar pipeline into viewer2.0. 2009-09-29 23:09:41 +00:00
llagentwearables.h Syncing latest appearance work from avatar pipeline into viewer2.0. 2009-09-29 23:09:41 +00:00
llanimstatelabels.cpp Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llanimstatelabels.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llappearance.h Merging in Avatar Pipeline work for Viewer 1.23 (QAR-1272). 2009-03-05 00:29:27 +00:00
llappearancemgr.cpp Syncing latest appearance work from avatar pipeline into viewer2.0. 2009-09-29 23:09:41 +00:00
llappearancemgr.h Merging down avatar-pipeline/currently-worn-folder-8. Includes fixes for EXT-1121: Attaching / detaching objects doesn't affect the Current Outfit folder, and EXT-1090: Attachments detach on login, as well as work in progress for ensemble support and look details. 2009-09-24 18:05:38 +00:00
llappviewer.cpp DEV-35039 Viewer 2.0 Help System - Viewer Development 2009-09-30 17:46:31 +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 Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llappviewerlinux_api.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llappviewerlinux_api.xml QAR-849 merge maint-viewer-10-merge 96838-97237 -> release 2008-09-23 01:53:11 +00:00
llappviewerlinux_api_dbus.cpp Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llappviewerlinux_api_dbus.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llappviewerlinux_api_dbus_syms_raw.inc QAR-849 merge maint-viewer-10-merge 96838-97237 -> release 2008-09-23 01:53:11 +00:00
llappviewermacosx.cpp 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 Merging render-pipeline-6-qa-2 into viewer-2 2009-09-22 11:11:45 +00:00
llappviewerwin32.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llassetuploadqueue.cpp Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llassetuploadqueue.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
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 Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
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 merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1830 https://svn.aws.productengine.com/secondlife/pe/stable-2@1839 -> viewer-2.0.0-3 2009-09-29 19:37:05 +00:00
llavataractions.h merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1830 https://svn.aws.productengine.com/secondlife/pe/stable-2@1839 -> viewer-2.0.0-3 2009-09-29 19:37:05 +00:00
llavatariconctrl.cpp DEV-40528 Viewer 2 floods server with AvatarPropertiesRequest messages causing database load. Icon cache was only being used to provide images more quickly, not to suppress network traffic. Made it suppress network traffic, which may result in stale icons occasionally. Converted online/offline tooltip to use LLAvatarTracker. Will port to viewer-2-qa-1. Reviewed with Richard. 2009-09-28 23:11:18 +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@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3 2009-10-01 17:44:44 +00:00
llavatarlist.h merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3 2009-10-01 17:44:44 +00:00
llavatarlistitem.cpp merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1830 https://svn.aws.productengine.com/secondlife/pe/stable-2@1839 -> viewer-2.0.0-3 2009-09-29 19:37:05 +00:00
llavatarlistitem.h merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1830 https://svn.aws.productengine.com/secondlife/pe/stable-2@1839 -> viewer-2.0.0-3 2009-09-29 19:37:05 +00:00
llavatarpropertiesprocessor.cpp merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1830 https://svn.aws.productengine.com/secondlife/pe/stable-2@1839 -> viewer-2.0.0-3 2009-09-29 19:37:05 +00:00
llavatarpropertiesprocessor.h merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1830 https://svn.aws.productengine.com/secondlife/pe/stable-2@1839 -> viewer-2.0.0-3 2009-09-29 19:37:05 +00:00
llbottomtray.cpp merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3 2009-10-01 17:44:44 +00:00
llbottomtray.h merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1830 https://svn.aws.productengine.com/secondlife/pe/stable-2@1839 -> viewer-2.0.0-3 2009-09-29 19:37:05 +00:00
llbox.cpp Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llbox.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llbreadcrumbview.cpp Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files: 2009-07-07 00:53:05 +00:00
llbreadcrumbview.h Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files: 2009-07-07 00:53:05 +00:00
llcallbacklist.cpp Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llcallbacklist.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llcallingcard.cpp DEV-40528 Viewer 2 floods server with AvatarPropertiesRequest messages causing database load. Icon cache was only being used to provide images more quickly, not to suppress network traffic. Made it suppress network traffic, which may result in stale icons occasionally. Converted online/offline tooltip to use LLAvatarTracker. Will port to viewer-2-qa-1. Reviewed with Richard. 2009-09-28 23:11:18 +00:00
llcallingcard.h DEV-40528 Viewer 2 floods server with AvatarPropertiesRequest messages causing database load. Icon cache was only being used to provide images more quickly, not to suppress network traffic. Made it suppress network traffic, which may result in stale icons occasionally. Converted online/offline tooltip to use LLAvatarTracker. Will port to viewer-2-qa-1. Reviewed with Richard. 2009-09-28 23:11:18 +00:00
llcapabilitylistener.cpp Fixed a bunch of missing includes and forward declares. I was trying to benchmark with precompiled headers off, but we'll have to do a bunch more cleanup before it's possible to disable that feature cleanly. Not reviewed. 2009-06-23 21:59:31 +00:00
llcapabilitylistener.h Fixed a bunch of missing includes and forward declares. I was trying to benchmark with precompiled headers off, but we'll have to do a bunch more cleanup before it's possible to disable that feature cleanly. Not reviewed. 2009-06-23 21:59:31 +00:00
llcapabilityprovider.h Merge of QAR-1383 event-system-7 into trunk. 2009-06-04 16:24:21 +00:00
llcaphttpsender.cpp Fixed a bunch of missing includes and forward declares. I was trying to benchmark with precompiled headers off, but we'll have to do a bunch more cleanup before it's possible to disable that feature cleanly. Not reviewed. 2009-06-23 21:59:31 +00:00
llcaphttpsender.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llchannelmanager.cpp merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3 2009-10-01 17:44:44 +00:00
llchannelmanager.h merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3 2009-10-01 17:44:44 +00:00
llchatbar.cpp converted focus change callbacks to use signals 2009-09-30 01:00:51 +00:00
llchatbar.h converted focus change callbacks to use signals 2009-09-30 01:00:51 +00:00
llchatitemscontainerctrl.cpp merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3 2009-10-01 17:44:44 +00:00
llchatitemscontainerctrl.h merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3 2009-10-01 17:44:44 +00:00
llchatmsgbox.cpp merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3 2009-10-01 17:44:44 +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 https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3 2009-10-01 17:44:44 +00:00
llchiclet.h merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3 2009-10-01 17:44:44 +00:00
llclassifiedinfo.cpp Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llclassifiedinfo.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
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 Fixed a bunch of missing includes and forward declares. I was trying to benchmark with precompiled headers off, but we'll have to do a bunch more cleanup before it's possible to disable that feature cleanly. Not reviewed. 2009-06-23 21:59:31 +00:00
llcloud.h merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
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 merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +00:00
llcommandhandler.cpp DEV-15182 VWR-5474 SEC-20: re-enabled support for clicking on the 2009-09-14 17:09:45 +00:00
llcommandhandler.h DEV-15182 VWR-5474 SEC-20: re-enabled support for clicking on the 2009-09-14 17:09:45 +00:00
llcommandlineparser.cpp Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llcommandlineparser.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llcompilequeue.cpp Fixed a bunch of missing includes and forward declares. I was trying to benchmark with precompiled headers off, but we'll have to do a bunch more cleanup before it's possible to disable that feature cleanly. Not reviewed. 2009-06-23 21:59:31 +00:00
llcompilequeue.h merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
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 Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llcurrencyuimanager.cpp merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
llcurrencyuimanager.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llcylinder.cpp Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llcylinder.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
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 Merging render-pipeline-6-qa-2 into viewer-2 2009-09-22 11:11:45 +00:00
lldebugview.h merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
lldelayedgestureerror.cpp Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
lldelayedgestureerror.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
lldirpicker.cpp merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
lldirpicker.h QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergeme 2009-02-03 17:56:26 +00:00
lldrawable.cpp svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 2009-10-01 02:35:53 +00:00
lldrawable.h svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 2009-10-01 02:35:53 +00:00
lldrawpool.cpp Merging render-pipeline-6-qa-2 into viewer-2 2009-09-22 11:11:45 +00:00
lldrawpool.h Merging render-pipeline-6-qa-2 into viewer-2 2009-09-22 11:11:45 +00:00
lldrawpoolalpha.cpp Merging render-pipeline-6-qa-2 into viewer-2 2009-09-22 11:11:45 +00:00
lldrawpoolalpha.h Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render-9) and QAR-1236 (dll-msvcrt-2) 2009-02-18 21:10:16 +00:00
lldrawpoolavatar.cpp Merging render-pipeline-6-qa-2 into viewer-2 2009-09-22 11:11:45 +00:00
lldrawpoolavatar.h merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +00:00
lldrawpoolbump.cpp SNOW-194 DEV-40415: pulling this snowglobe patch into viewer 2.0. This 2009-09-25 16:51:25 +00:00
lldrawpoolbump.h merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +00:00
lldrawpoolclouds.cpp Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
lldrawpoolclouds.h Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render-9) and QAR-1236 (dll-msvcrt-2) 2009-02-18 21:10:16 +00:00
lldrawpoolground.cpp Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
lldrawpoolground.h Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render-9) and QAR-1236 (dll-msvcrt-2) 2009-02-18 21:10:16 +00:00
lldrawpoolsimple.cpp Merging render-pipeline-6-qa-2 into viewer-2 2009-09-22 11:11:45 +00:00
lldrawpoolsimple.h Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render-9) and QAR-1236 (dll-msvcrt-2) 2009-02-18 21:10:16 +00:00
lldrawpoolsky.cpp merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +00:00
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 Merging render-pipeline-6-qa-2 into viewer-2 2009-09-22 11:11:45 +00:00
lldrawpoolterrain.h merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +00:00
lldrawpooltree.cpp Merging render-pipeline-6-qa-2 into viewer-2 2009-09-22 11:11:45 +00:00
lldrawpooltree.h merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +00:00
lldrawpoolwater.cpp Merging render-pipeline-6-qa-2 into viewer-2 2009-09-22 11:11:45 +00:00
lldrawpoolwater.h Merging render-pipeline-6-qa-2 into viewer-2 2009-09-22 11:11:45 +00:00
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 merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +00:00
lldriverparam.cpp Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
lldriverparam.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
lldynamictexture.cpp merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +00:00
lldynamictexture.h QAR-1602 Checkpoint for Avatar Pipeline Multiple textures branch 2009-07-14 15:14:46 +00:00
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 Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
lleventinfo.cpp Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
lleventinfo.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
lleventnotifier.cpp Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files: 2009-07-07 00:53:05 +00:00
lleventnotifier.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
lleventpoll.cpp svn merge -r107016:108767 svn+ssh://svn.lindenlab.com/svn/linden/viewer/viewer_1-22 2009-02-03 21:15:57 +00:00
lleventpoll.h Fixed a bunch of missing includes and forward declares. I was trying to benchmark with precompiled headers off, but we'll have to do a bunch more cleanup before it's possible to disable that feature cleanly. Not reviewed. 2009-06-23 21:59:31 +00:00
llexpandabletextbox.cpp merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1830 https://svn.aws.productengine.com/secondlife/pe/stable-2@1839 -> viewer-2.0.0-3 2009-09-29 19:37:05 +00:00
llexpandabletextbox.h merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1830 https://svn.aws.productengine.com/secondlife/pe/stable-2@1839 -> viewer-2.0.0-3 2009-09-29 19:37:05 +00:00
llface.cpp svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 2009-10-01 02:35:53 +00:00
llface.h svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 2009-10-01 02:35:53 +00:00
llface.inl QAR-992 Merging revisions 101012-101170,101686-101687 of svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into linden/release 2008-11-07 17:51:03 +00:00
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 https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3 2009-10-01 17:44:44 +00:00
llfavoritesbar.h merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3 2009-10-01 17:44:44 +00:00
llfeaturemanager.cpp merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +00:00
llfeaturemanager.h Fixed a bunch of missing includes and forward declares. I was trying to benchmark with precompiled headers off, but we'll have to do a bunch more cleanup before it's possible to disable that feature cleanly. Not reviewed. 2009-06-23 21:59:31 +00:00
llfilepicker.cpp merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
llfilepicker.h svn merge -r117314:117337 2009-04-16 23:45:35 +00:00
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 merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
llfloaterabout.cpp EXT-832 Unable to copy and paste from the help --> about dialog. Added edit menu items into menu_login.xml under the Debug item to make keyboard shortcuts work. Added "Copy to Clipboard" button. Broke text into a tab container with Support, Credits and Licenses sections. Reviewed with Qarl. 2009-09-21 16:59:27 +00:00
llfloaterabout.h EXT-832 Unable to copy and paste from the help --> about dialog. Added edit menu items into menu_login.xml under the Debug item to make keyboard shortcuts work. Added "Copy to Clipboard" button. Broke text into a tab container with Support, Credits and Licenses sections. Reviewed with Qarl. 2009-09-21 16:59:27 +00:00
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 merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +00:00
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 Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files: 2009-07-07 00:53:05 +00:00
llfloaterbuildoptions.h Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files: 2009-07-07 00:53:05 +00:00
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 Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files: 2009-07-07 00:53:05 +00:00
llfloaterbump.cpp Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files: 2009-07-07 00:53:05 +00:00
llfloaterbump.h Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files: 2009-07-07 00:53:05 +00:00
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/viewer-2-0@1830 https://svn.aws.productengine.com/secondlife/pe/stable-2@1839 -> viewer-2.0.0-3 2009-09-29 19:37:05 +00:00
llfloatercamera.h merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1830 https://svn.aws.productengine.com/secondlife/pe/stable-2@1839 -> viewer-2.0.0-3 2009-09-29 19:37:05 +00:00
llfloaterchat.cpp DEV-35039 Viewer 2.0 Help System - Viewer Development 2009-09-30 17:46:31 +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 merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3 2009-10-01 17:44:44 +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 merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +00:00
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 Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files: 2009-07-07 00:53:05 +00:00
llfloaterfonttest.h Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files: 2009-07-07 00:53:05 +00:00
llfloaterfriends.cpp Merging the SLURLs Everywhere branch (viewer-2.0.0-slurls-3) into 2009-09-04 12:11:27 +00:00
llfloaterfriends.h merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
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 merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
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 DEV-15182 VWR-5474 SEC-20: re-enabled support for clicking on the 2009-09-14 17:09:45 +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
llfloaterhelpbrowser.cpp DEV-39995: the help browser would crash on open if the media ctrl 2009-10-01 10:23:23 +00:00
llfloaterhelpbrowser.h DEV-35039 Viewer 2.0 Help System - Viewer Development 2009-09-30 17:46:31 +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 Header file corrections to let us build without precompiled headers from llprimitive and llvfs. Allows better dependency analysis. 2009-09-10 21:15:41 +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 DEV-34748 Moved logic for setting inspection tools from construction to onOpen for LLFloaterInspect. Reviewed by Richard. 2009-07-08 22:36:39 +00:00
llfloaterinventory.cpp Cherry pick of simple fix for duplicate inventory folders (one non working) in some inventory panel views. 2009-09-30 16:05:41 +00:00
llfloaterinventory.h Cherry pick of simple fix for duplicate inventory folders (one non working) in some inventory panel views. 2009-09-30 16:05:41 +00:00
llfloaterjoystick.cpp Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files: 2009-07-07 00:53:05 +00:00
llfloaterjoystick.h Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files: 2009-07-07 00:53:05 +00:00
llfloaterlagmeter.cpp svn merge -r 129543-130091 skinning-19 -> viewer-2.0.0-3 2009-08-11 06:37:35 +00:00
llfloaterlagmeter.h Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files: 2009-07-07 00:53:05 +00:00
llfloaterland.cpp converted focus change callbacks to use signals 2009-09-30 01:00:51 +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 merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
llfloatermediabrowser.cpp svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 2009-10-01 02:35:53 +00:00
llfloatermediabrowser.h DEV-35039 Viewer 2.0 Help System - Viewer Development 2009-09-30 17:46:31 +00:00
llfloatermediasettings.cpp svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 2009-10-01 02:35:53 +00:00
llfloatermediasettings.h svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 2009-10-01 02:35:53 +00:00
llfloatermemleak.cpp Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files: 2009-07-07 00:53:05 +00:00
llfloatermemleak.h Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files: 2009-07-07 00:53:05 +00:00
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 Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files: 2009-07-07 00:53:05 +00:00
llfloaterparcel.cpp DEV-15182 VWR-5474 SEC-20: re-enabled support for clicking on the 2009-09-14 17:09:45 +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 converted focus change callbacks to use signals 2009-09-30 01:00:51 +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 svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 2009-10-01 02:35:53 +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 Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files: 2009-07-07 00:53:05 +00:00
llfloaterreporter.cpp DEV-35039 Viewer 2.0 Help System - Viewer Development 2009-09-30 17:46:31 +00:00
llfloaterreporter.h DEV-35039 Viewer 2.0 Help System - Viewer Development 2009-09-30 17:46:31 +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 EXT-803 Parcel highlight stays lit after setting a parcel for sale and closing the About Land floater. The LLFloaterReg conversion made this floater single_instance, which means it does not destroy itself on close. We therefore need to explicitly clean up the parcel selection when the sell land floater is closed. Reviewed with Leyla. 2009-09-15 23:48:14 +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 Merging render-pipeline-6-qa-2 into viewer-2 2009-09-22 11:11:45 +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 EXT-610 Cannot change file type in snapshots floater -- to be reviewed 2009-09-15 09:34:17 +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 Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files: 2009-07-07 00:53:05 +00:00
llfloatertools.cpp svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 2009-10-01 02:35:53 +00:00
llfloatertools.h svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 2009-10-01 02:35:53 +00:00
llfloatertopobjects.cpp Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files: 2009-07-07 00:53:05 +00:00
llfloatertopobjects.h Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files: 2009-07-07 00:53:05 +00:00
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 Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files: 2009-07-07 00:53:05 +00:00
llfloaterurldisplay.h Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files: 2009-07-07 00:53:05 +00:00
llfloaterurlentry.cpp svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 2009-10-01 02:35:53 +00:00
llfloaterurlentry.h svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 2009-10-01 02:35:53 +00:00
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
llfloaterwhitelistentry.cpp svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 2009-10-01 02:35:53 +00:00
llfloaterwhitelistentry.h svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 2009-10-01 02:35:53 +00:00
llfloaterwindlight.cpp Merging render-pipeline-6-qa-2 into viewer-2 2009-09-22 11:11:45 +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 converted focus change callbacks to use signals 2009-09-30 01:00:51 +00:00
llfolderview.h converted focus change callbacks to use signals 2009-09-30 01:00:51 +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 For DEV-34223: Avatar Pipeline Project - M6 (Current Outfit Folder, Appearance Side Panel) - brought merge branch changes from avatar-pipeline/viewer-2.0.0-3_cwf-7_merge into viewer-2.0.0-3. 2009-09-10 18:42:19 +00:00
llfolderviewitem.h Header file corrections to let us build without precompiled headers from llprimitive and llvfs. Allows better dependency analysis. 2009-09-10 21:15:41 +00:00
llfollowcam.cpp Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llfollowcam.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
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 DEV-15182 VWR-5474 SEC-20: re-enabled support for clicking on the 2009-09-14 17:09:45 +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 https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3 2009-10-01 17:44:44 +00:00
llgrouplist.h merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3 2009-10-01 17:44:44 +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 Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
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 merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +00:00
llhudeffect.h merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
llhudeffectbeam.cpp merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +00:00
llhudeffectbeam.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llhudeffectlookat.cpp SNOW-194 DEV-40415: pulling this snowglobe patch into viewer 2.0. This 2009-09-25 16:51:25 +00:00
llhudeffectlookat.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llhudeffectpointat.cpp svn merge -r117314:117337 2009-04-16 23:45:35 +00:00
llhudeffectpointat.h Fixed a bunch of missing includes and forward declares. I was trying to benchmark with precompiled headers off, but we'll have to do a bunch more cleanup before it's possible to disable that feature cleanly. Not reviewed. 2009-06-23 21:59:31 +00:00
llhudeffecttrail.cpp merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +00:00
llhudeffecttrail.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llhudicon.cpp merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +00:00
llhudicon.h merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +00:00
llhudmanager.cpp merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3 2009-08-24 20:04:52 +00:00
llhudmanager.h merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
llhudobject.cpp merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3 2009-08-24 20:04:52 +00:00
llhudobject.h merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
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 merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
llhudtext.cpp Merging render-pipeline-6-qa-2 into viewer-2 2009-09-22 11:11:45 +00:00
llhudtext.h merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
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
llimfloater.cpp merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3 2009-10-01 17:44:44 +00:00
llimfloater.h merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3 2009-10-01 17:44:44 +00:00
llimhandler.cpp merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3 2009-10-01 17:44:44 +00:00
llimpanel.cpp merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3 2009-10-01 17:44:44 +00:00
llimpanel.h merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3 2009-10-01 17:44:44 +00:00
llimview.cpp merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3 2009-10-01 17:44:44 +00:00
llimview.h merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3 2009-10-01 17:44: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@1830 https://svn.aws.productengine.com/secondlife/pe/stable-2@1839 -> viewer-2.0.0-3 2009-09-29 19:37:05 +00:00
llinventorybridge.h For DEV-34223: Avatar Pipeline Project - M6 (Current Outfit Folder, Appearance Side Panel) - brought merge branch changes from avatar-pipeline/viewer-2.0.0-3_cwf-7_merge into viewer-2.0.0-3. 2009-09-10 18:42:19 +00:00
llinventoryclipboard.cpp Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llinventoryclipboard.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
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 For DEV-34223: Avatar Pipeline Project - M6 (Current Outfit Folder, Appearance Side Panel) - brought merge branch changes from avatar-pipeline/viewer-2.0.0-3_cwf-7_merge into viewer-2.0.0-3. 2009-09-10 18:42:19 +00:00
llinventorymodel.cpp Merging down avatar-pipeline/currently-worn-folder-8. Includes fixes for EXT-1121: Attaching / detaching objects doesn't affect the Current Outfit folder, and EXT-1090: Attachments detach on login, as well as work in progress for ensemble support and look details. 2009-09-24 18:05:38 +00:00
llinventorymodel.h Merging down avatar-pipeline/currently-worn-folder-8. Includes fixes for EXT-1121: Attaching / detaching objects doesn't affect the Current Outfit folder, and EXT-1090: Attachments detach on login, as well as work in progress for ensemble support and look details. 2009-09-24 18:05:38 +00:00
lljoystickbutton.cpp merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +00:00
lljoystickbutton.h merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +00:00
lllandmarkactions.cpp merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1830 https://svn.aws.productengine.com/secondlife/pe/stable-2@1839 -> viewer-2.0.0-3 2009-09-29 19:37:05 +00:00
lllandmarkactions.h merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1830 https://svn.aws.productengine.com/secondlife/pe/stable-2@1839 -> viewer-2.0.0-3 2009-09-29 19:37:05 +00:00
lllandmarklist.cpp Decided that the lldebugs should really be llwarns. 2009-09-23 23:32:29 +00:00
lllandmarklist.h merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
lllightconstants.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
lllistbrowser.cpp Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files: 2009-07-07 00:53:05 +00:00
lllistbrowser.h Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files: 2009-07-07 00:53:05 +00:00
lllistview.cpp Merge skinning-15 to viewer-2. Fixes include: 2009-07-14 19:06:17 +00:00
lllistview.h Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files: 2009-07-07 00:53:05 +00:00
lllocaltextureobject.cpp QAR-1602 checkpoint for multiple textures 2009-07-14 17:14:40 +00:00
lllocaltextureobject.h QAR-1602 checkpoint for multiple textures 2009-07-14 17:14:40 +00:00
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 EXT-1251: strip leading/trailing whitespace from user input in the 2009-10-01 09:52:05 +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 merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
lllogchat.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
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 DEV-15182 VWR-5474 SEC-20: re-enabled support for clicking on the 2009-09-14 17:09:45 +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 Merging render-pipeline-6-qa-2 into viewer-2 2009-09-22 11:11:45 +00:00
llmanip.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
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 Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llmanipscale.cpp Merge xui-army-5 to viewer-2, includes layout, art, and color changes, also UI color refactoring and new FreeType font library on Linux. 2009-07-06 21:58:04 +00:00
llmanipscale.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
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 svn merge -r106055-107012 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-22/ 2009-01-13 03:46:56 +00:00
llmediactrl.cpp svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 2009-10-01 02:35:53 +00:00
llmediactrl.h svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 2009-10-01 02:35:53 +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 merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
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 merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
llmetricperformancetester.cpp merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
llmetricperformancetester.h merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
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 merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
llmorphview.h merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
llmoveview.cpp merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1830 https://svn.aws.productengine.com/secondlife/pe/stable-2@1839 -> viewer-2.0.0-3 2009-09-29 19:37:05 +00:00
llmoveview.h merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1830 https://svn.aws.productengine.com/secondlife/pe/stable-2@1839 -> viewer-2.0.0-3 2009-09-29 19:37:05 +00:00
llmutelist.cpp merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
llmutelist.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
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 merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
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 EXT-1251: strip leading/trailing whitespace from user input in the 2009-10-01 09:52:05 +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@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3 2009-10-01 17:44:44 +00:00
llnearbychat.h merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3 2009-10-01 17:44:44 +00:00
llnearbychatbar.cpp converted focus change callbacks to use signals 2009-09-30 01:00:51 +00:00
llnearbychatbar.h merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1830 https://svn.aws.productengine.com/secondlife/pe/stable-2@1839 -> viewer-2.0.0-3 2009-09-29 19:37:05 +00:00
llnearbychathandler.cpp merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3 2009-10-01 17:44:44 +00:00
llnearbychathandler.h merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1830 https://svn.aws.productengine.com/secondlife/pe/stable-2@1839 -> viewer-2.0.0-3 2009-09-29 19:37:05 +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 merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3 2009-10-01 17:44:44 +00:00
llnotificationgrouphandler.cpp merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3 2009-10-01 17:44:44 +00:00
llnotificationhandler.h merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3 2009-10-01 17:44:44 +00:00
llnotificationmanager.cpp merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1830 https://svn.aws.productengine.com/secondlife/pe/stable-2@1839 -> viewer-2.0.0-3 2009-09-29 19:37:05 +00:00
llnotificationmanager.h merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1830 https://svn.aws.productengine.com/secondlife/pe/stable-2@1839 -> viewer-2.0.0-3 2009-09-29 19:37:05 +00:00
llnotificationscripthandler.cpp merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3 2009-10-01 17:44:44 +00:00
llnotificationtiphandler.cpp merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3 2009-10-01 17:44:44 +00:00
lloutputmonitorctrl.cpp merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1830 https://svn.aws.productengine.com/secondlife/pe/stable-2@1839 -> viewer-2.0.0-3 2009-09-29 19:37:05 +00:00
lloutputmonitorctrl.h merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1830 https://svn.aws.productengine.com/secondlife/pe/stable-2@1839 -> viewer-2.0.0-3 2009-09-29 19:37:05 +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@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3 2009-10-01 17:44:44 +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 converted focus change callbacks to use signals 2009-09-30 01:00:51 +00:00
llpanelclassified.h svn merge -r121194:121210 2009-05-22 09:58:47 +00:00
llpanelcontents.cpp svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 2009-10-01 02:35:53 +00:00
llpanelcontents.h svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 2009-10-01 02:35:53 +00:00
llpanelface.cpp svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 2009-10-01 02:35:53 +00:00
llpanelface.h svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 2009-10-01 02:35:53 +00:00
llpanelgroup.cpp merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3 2009-10-01 17:44:44 +00:00
llpanelgroup.h merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1830 https://svn.aws.productengine.com/secondlife/pe/stable-2@1839 -> viewer-2.0.0-3 2009-09-29 19:37:05 +00:00
llpanelgroupgeneral.cpp merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3 2009-10-01 17:44:44 +00:00
llpanelgroupgeneral.h merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1830 https://svn.aws.productengine.com/secondlife/pe/stable-2@1839 -> viewer-2.0.0-3 2009-09-29 19:37:05 +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 merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
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 converted focus change callbacks to use signals 2009-09-30 01:00:51 +00:00
llpanelgrouproles.h merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1634 https://svn.aws.productengine.com/secondlife/pe/stable-2@1648 -> viewer-2.0.0-3 2009-09-11 23:50:59 +00:00
llpanelimcontrolpanel.cpp merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1830 https://svn.aws.productengine.com/secondlife/pe/stable-2@1839 -> viewer-2.0.0-3 2009-09-29 19:37:05 +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 Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files: 2009-07-07 00:53:05 +00:00
llpanelland.h merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
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 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 2009-10-01 02:35:53 +00:00
llpanellandmedia.h svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 2009-10-01 02:35:53 +00:00
llpanellogin.cpp svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 2009-10-01 02:35:53 +00:00
llpanellogin.h converted focus change callbacks to use signals 2009-09-30 01:00:51 +00:00
llpanelmediasettingsgeneral.cpp svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 2009-10-01 02:35:53 +00:00
llpanelmediasettingsgeneral.h svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 2009-10-01 02:35:53 +00:00
llpanelmediasettingspermissions.cpp svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 2009-10-01 02:35:53 +00:00
llpanelmediasettingspermissions.h svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 2009-10-01 02:35:53 +00:00
llpanelmediasettingssecurity.cpp svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 2009-10-01 02:35:53 +00:00
llpanelmediasettingssecurity.h svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 2009-10-01 02:35:53 +00:00
llpanelobject.cpp Header file corrections to let us build without precompiled headers from llprimitive and llvfs. Allows better dependency analysis. 2009-09-10 21:15:41 +00:00
llpanelobject.h merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
llpanelpeople.cpp merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3 2009-10-01 17:44:44 +00:00
llpanelpeople.h merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3 2009-10-01 17:44:44 +00:00
llpanelpeoplemenus.cpp merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1830 https://svn.aws.productengine.com/secondlife/pe/stable-2@1839 -> viewer-2.0.0-3 2009-09-29 19:37:05 +00:00
llpanelpeoplemenus.h merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1830 https://svn.aws.productengine.com/secondlife/pe/stable-2@1839 -> viewer-2.0.0-3 2009-09-29 19:37:05 +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 merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
llpanelpick.cpp merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3 2009-10-01 17:44:44 +00:00
llpanelpick.h merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3 2009-10-01 17:44:44 +00:00
llpanelpicks.cpp merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3 2009-10-01 17:44:44 +00:00
llpanelpicks.h merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3 2009-10-01 17:44:44 +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 merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
llpanelplaceinfo.cpp merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1830 https://svn.aws.productengine.com/secondlife/pe/stable-2@1839 -> viewer-2.0.0-3 2009-09-29 19:37:05 +00:00
llpanelplaceinfo.h merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1830 https://svn.aws.productengine.com/secondlife/pe/stable-2@1839 -> viewer-2.0.0-3 2009-09-29 19:37:05 +00:00
llpanelplaces.cpp merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3 2009-10-01 17:44:44 +00:00
llpanelplaces.h merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1830 https://svn.aws.productengine.com/secondlife/pe/stable-2@1839 -> viewer-2.0.0-3 2009-09-29 19:37:05 +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 merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1830 https://svn.aws.productengine.com/secondlife/pe/stable-2@1839 -> viewer-2.0.0-3 2009-09-29 19:37:05 +00:00
llpanelprofile.h merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1830 https://svn.aws.productengine.com/secondlife/pe/stable-2@1839 -> viewer-2.0.0-3 2009-09-29 19:37:05 +00:00
llpanelprofileview.cpp merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1830 https://svn.aws.productengine.com/secondlife/pe/stable-2@1839 -> viewer-2.0.0-3 2009-09-29 19:37:05 +00:00
llpanelprofileview.h merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1830 https://svn.aws.productengine.com/secondlife/pe/stable-2@1839 -> viewer-2.0.0-3 2009-09-29 19:37:05 +00:00
llpanelteleporthistory.cpp merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3 2009-10-01 17:44:44 +00:00
llpanelteleporthistory.h merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1830 https://svn.aws.productengine.com/secondlife/pe/stable-2@1839 -> viewer-2.0.0-3 2009-09-29 19:37:05 +00:00
llpanelvolume.cpp Merging render-pipeline-6-qa-2 into viewer-2 2009-09-22 11:11:45 +00:00
llpanelvolume.h Merging render-pipeline-6-qa-2 into viewer-2 2009-09-22 11:11:45 +00:00
llparcelselection.cpp Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llparcelselection.h merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
llpatchvertexarray.cpp Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llpatchvertexarray.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llpolymesh.cpp Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llpolymesh.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llpolymorph.cpp Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llpolymorph.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
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 DEV-34488 Can not save script to a prim. Underlying issue was LLPreview holding two member variables mObjectUUID and mObjectID. mObjectID was null for scripts. It appears to be used only for notecards (?), so I converted it to mNotecardObjectID and switched references to point to mObjectUUID. Renamed one other variable to mSaveObjectID for clarity. Removed unnecessary include files and de-inlined a couple functions because I was there. Reviewed with Steve. 2009-06-25 18:41:04 +00:00
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 DEV-35039 Viewer 2.0 Help System - Viewer Development 2009-09-30 17:46:31 +00:00
llpreviewscript.h DEV-35039 Viewer 2.0 Help System - Viewer Development 2009-09-30 17:46:31 +00:00
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 merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
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 merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +00:00
llproductinforequest.cpp QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3 2009-05-04 17:43:26 +00:00
llproductinforequest.h QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3 2009-05-04 17:43:26 +00:00
llprogressview.cpp DEV-40021 Can't walk after teleport until you click in world. Changed progress view to explicitly release focus when fade-out animation is complete. Reviewed with Richard. 2009-09-15 21:44:16 +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 merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1830 https://svn.aws.productengine.com/secondlife/pe/stable-2@1839 -> viewer-2.0.0-3 2009-09-29 19:37:05 +00:00
llrecentpeople.h merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1830 https://svn.aws.productengine.com/secondlife/pe/stable-2@1839 -> viewer-2.0.0-3 2009-09-29 19:37:05 +00:00
llregionposition.cpp Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llregionposition.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llremoteparcelrequest.cpp merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1830 https://svn.aws.productengine.com/secondlife/pe/stable-2@1839 -> viewer-2.0.0-3 2009-09-29 19:37:05 +00:00
llremoteparcelrequest.h merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
llresourcedata.h QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergeme 2009-02-03 17:56:26 +00:00
llrootview.h Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files: 2009-07-07 00:53:05 +00:00
llsavedsettingsglue.cpp merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
llsavedsettingsglue.h merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
llscreenchannel.cpp merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3 2009-10-01 17:44:44 +00:00
llscreenchannel.h merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3 2009-10-01 17:44:44 +00:00
llsearchcombobox.cpp merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1634 https://svn.aws.productengine.com/secondlife/pe/stable-2@1648 -> viewer-2.0.0-3 2009-09-11 23:50:59 +00:00
llsearchcombobox.h svn merge svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1614 https://svn.aws.productengine.com/secondlife/pe/stable-2@1618 -> viewer-2.0.0-3 2009-09-11 00:00:10 +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 svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 2009-10-01 02:35:53 +00:00
llselectmgr.h svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 2009-10-01 02:35:53 +00:00
llsidetray.cpp merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3 2009-10-01 17:44:44 +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 Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
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 -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 2009-10-01 02:35:53 +00:00
llspatialpartition.h svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 2009-10-01 02:35:53 +00:00
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 merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +00:00
llsprite.h merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +00:00
llsrv.cpp Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llsrv.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llstartup.cpp DEV-35039 Viewer 2.0 Help System - Viewer Development 2009-09-30 17:46:31 +00:00
llstartup.h merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +00:00
llstatusbar.cpp merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3 2009-10-01 17:44:44 +00:00
llstatusbar.h merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3 2009-10-01 17:44:44 +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 fix for EXT-1125: Mini-map terrain appears green on login with Low graphics settings. 2009-09-23 21:04:57 +00:00
llsurface.h merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +00:00
llsurfacepatch.cpp Merging render-pipeline-6-qa-2 into viewer-2 2009-09-22 11:11:45 +00:00
llsurfacepatch.h Merging render-pipeline-6-qa-2 into viewer-2 2009-09-22 11:11:45 +00:00
llsyswellitem.cpp merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1830 https://svn.aws.productengine.com/secondlife/pe/stable-2@1839 -> viewer-2.0.0-3 2009-09-29 19:37:05 +00:00
llsyswellitem.h merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1830 https://svn.aws.productengine.com/secondlife/pe/stable-2@1839 -> viewer-2.0.0-3 2009-09-29 19:37:05 +00:00
llsyswellwindow.cpp merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3 2009-10-01 17:44:44 +00:00
llsyswellwindow.h merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3 2009-10-01 17:44:44 +00:00
lltable.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
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 merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
lltexglobalcolor.h merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
lltexlayer.cpp QAR-1602 Checkpoint for Avatar Pipeline Multiple textures branch 2009-07-14 15:14:46 +00:00
lltexlayer.h Merging render-pipeline-6-qa-2 into viewer-2 2009-09-22 11:11:45 +00:00
lltexlayerparams.cpp Merging render-pipeline-6-qa-2 into viewer-2 2009-09-22 11:11:45 +00:00
lltexlayerparams.h merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +00:00
lltextureatlas.cpp Merging render-pipeline-6-qa-2 into viewer-2 2009-09-22 11:11:45 +00:00
lltextureatlas.h Merging render-pipeline-6-qa-2 into viewer-2 2009-09-22 11:11:45 +00:00
lltextureatlasmanager.cpp Merging render-pipeline-6-qa-2 into viewer-2 2009-09-22 11:11:45 +00:00
lltextureatlasmanager.h Merging render-pipeline-6-qa-2 into viewer-2 2009-09-22 11:11:45 +00:00
lltexturecache.cpp merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
lltexturecache.h Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render-9) and QAR-1236 (dll-msvcrt-2) 2009-02-18 21:10:16 +00:00
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 merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +00:00
lltexturefetch.h merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +00:00
lltextureview.cpp Merging render-pipeline-6-qa-2 into viewer-2 2009-09-22 11:11:45 +00:00
lltextureview.h Merging render-pipeline-6-qa-2 into viewer-2 2009-09-22 11:11:45 +00:00
lltoast.cpp merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3 2009-10-01 17:44:44 +00:00
lltoast.h merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3 2009-10-01 17:44:44 +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@1830 https://svn.aws.productengine.com/secondlife/pe/stable-2@1839 -> viewer-2.0.0-3 2009-09-29 19:37:05 +00:00
lltoastimpanel.h merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1830 https://svn.aws.productengine.com/secondlife/pe/stable-2@1839 -> viewer-2.0.0-3 2009-09-29 19:37:05 +00:00
lltoastnotifypanel.cpp merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1830 https://svn.aws.productengine.com/secondlife/pe/stable-2@1839 -> viewer-2.0.0-3 2009-09-29 19:37:05 +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@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3 2009-10-01 17:44:44 +00:00
lltool.cpp svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 2009-10-01 02:35:53 +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 merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
lltoolbrush.cpp merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
lltoolbrush.h svn merge -r114093:114412 svn+ssh://svn.lindenlab.com/svn/linden/branches/featurettes/featurettes-batch5-merge 2009-03-13 21:28:40 +00:00
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 https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1830 https://svn.aws.productengine.com/secondlife/pe/stable-2@1839 -> viewer-2.0.0-3 2009-09-29 19:37:05 +00:00
lltooldraganddrop.h merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1830 https://svn.aws.productengine.com/secondlife/pe/stable-2@1839 -> viewer-2.0.0-3 2009-09-29 19:37:05 +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 Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
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 Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
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 merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
lltoolgun.cpp EXT-904 Build tools does not show tooltips on any checkbox 2009-09-23 22:25: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 merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
lltoolindividual.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
lltoolmgr.cpp DEV-39508 = Show Tools ("Build") menu by default 2009-09-04 23:55:15 +00:00
lltoolmgr.h merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
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 merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +00:00
lltoolobjpicker.cpp merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
lltoolobjpicker.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
lltoolpie.cpp svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 2009-10-01 02:35:53 +00:00
lltoolpie.h svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 2009-10-01 02:35:53 +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 Header file corrections to let us build without precompiled headers from llprimitive and llvfs. Allows better dependency analysis. 2009-09-10 21:15:41 +00:00
lltoolplacer.h merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
lltoolselect.cpp merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
lltoolselect.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
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 Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
lltoolselectrect.cpp merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
lltoolselectrect.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
lltoolview.cpp merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
lltoolview.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
lltracker.cpp Merge xui-army-5 to viewer-2, includes layout, art, and color changes, also UI color refactoring and new FreeType font library on Linux. 2009-07-06 21:58:04 +00:00
lltracker.h merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
lluiconstants.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
lluploaddialog.cpp Merge xui-army-5 to viewer-2, includes layout, art, and color changes, also UI color refactoring and new FreeType font library on Linux. 2009-07-06 21:58:04 +00:00
lluploaddialog.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llurl.cpp Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llurl.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llurldispatcher.cpp DEV-35039 Viewer 2.0 Help System - Viewer Development 2009-09-30 17:46:31 +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 Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llurlhistory.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
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 Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llurlwhitelist.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llvectorperfoptions.cpp Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llvectorperfoptions.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llviewchildren.cpp merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
llviewchildren.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llviewerassetstorage.cpp Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
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 Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llviewercamera.cpp SNOW-194 DEV-40415: pulling this snowglobe patch into viewer 2.0. This 2009-09-25 16:51:25 +00:00
llviewercamera.h Merging render-pipeline-6-qa-2 into viewer-2 2009-09-22 11:11:45 +00:00
llviewercontrol.cpp merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1830 https://svn.aws.productengine.com/secondlife/pe/stable-2@1839 -> viewer-2.0.0-3 2009-09-29 19:37:05 +00:00
llviewercontrol.h DEV-35112 Renamed colors_def.xml to colors.xml. Reviewed by Richard. 2009-07-09 00:59:52 +00:00
llviewerdisplay.cpp Merging render-pipeline-6-qa-2 into viewer-2 2009-09-22 11:11:45 +00:00
llviewerdisplay.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llviewerfloaterreg.cpp svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 2009-10-01 02:35:53 +00:00
llviewerfloaterreg.h merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
llviewergenericmessage.cpp Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llviewergenericmessage.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
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 Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llviewerhelp.cpp DEV-35039 Viewer 2.0 Help System - Viewer Development 2009-09-30 17:46:31 +00:00
llviewerhelp.h DEV-35039 Viewer 2.0 Help System - Viewer Development 2009-09-30 17:46:31 +00:00
llviewerhelputil.cpp DEV-35039 Viewer 2.0 Help System - Viewer Development 2009-09-30 17:46:31 +00:00
llviewerhelputil.h DEV-35039 Viewer 2.0 Help System - Viewer Development 2009-09-30 17:46:31 +00:00
llviewerinventory.cpp Fix error with message template incompatibility for LinkInventoryItem.Merging newinventorymsg__merge__viewer-2.0.0-3__r131585 into viewer-2 trunk, see QAR-1804 and QAR-1805. 2009-09-17 16:53:36 +00:00
llviewerinventory.h Header file corrections to let us build without precompiled headers from llprimitive and llvfs. Allows better dependency analysis. 2009-09-10 21:15:41 +00:00
llviewerjoint.cpp QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3 2009-05-04 17:43:26 +00:00
llviewerjoint.h QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3 2009-05-04 17:43:26 +00:00
llviewerjointattachment.cpp QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3 2009-05-04 17:43:26 +00:00
llviewerjointattachment.h merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
llviewerjointmesh.cpp Merging render-pipeline-6-qa-2 into viewer-2 2009-09-22 11:11:45 +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 Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llviewerjointmesh_sse2.cpp Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llviewerjointmesh_vec.cpp Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llviewerjoystick.cpp svn merge -r117314:117337 2009-04-16 23:45:35 +00:00
llviewerjoystick.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llviewerkeyboard.cpp SNOW-194 DEV-40415: pulling this snowglobe patch into viewer 2.0. This 2009-09-25 16:51:25 +00:00
llviewerkeyboard.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llviewerlayer.cpp Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llviewerlayer.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llviewermedia.cpp svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 2009-10-01 02:35:53 +00:00
llviewermedia.h svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 2009-10-01 02:35:53 +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 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 2009-10-01 02:35:53 +00:00
llviewermediafocus.h svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 2009-10-01 02:35:53 +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 https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3 2009-10-01 17:44:44 +00:00
llviewermenu.h merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3 2009-10-01 17:44:44 +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 QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergeme 2009-02-03 17:56:26 +00:00
llviewermessage.cpp merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1830 https://svn.aws.productengine.com/secondlife/pe/stable-2@1839 -> viewer-2.0.0-3 2009-09-29 19:37:05 +00:00
llviewermessage.h Fixed a bunch of missing includes and forward declares. I was trying to benchmark with precompiled headers off, but we'll have to do a bunch more cleanup before it's possible to disable that feature cleanly. Not reviewed. 2009-06-23 21:59:31 +00:00
llviewernetwork.cpp merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
llviewernetwork.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llviewerobject.cpp svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 2009-10-01 02:35:53 +00:00
llviewerobject.h svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 2009-10-01 02:35:53 +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 Fixed a bunch of missing includes and forward declares. I was trying to benchmark with precompiled headers off, but we'll have to do a bunch more cleanup before it's possible to disable that feature cleanly. Not reviewed. 2009-06-23 21:59:31 +00:00
llviewerparcelmedia.cpp svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 2009-10-01 02:35:53 +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 DEV-35039 Viewer 2.0 Help System - Viewer Development 2009-09-30 17:46:31 +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 Merging render-pipeline-6-qa-2 into viewer-2 2009-09-22 11:11:45 +00:00
llviewerparceloverlay.h Merging render-pipeline-6-qa-2 into viewer-2 2009-09-22 11:11:45 +00:00
llviewerpartsim.cpp merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3 2009-08-24 20:04:52 +00:00
llviewerpartsim.h merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +00:00
llviewerpartsource.cpp Merging render-pipeline-6-qa-2 into viewer-2 2009-09-22 11:11:45 +00:00
llviewerpartsource.h merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +00:00
llviewerprecompiledheaders.cpp Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llviewerprecompiledheaders.h Header file corrections to let us build without precompiled headers from llprimitive and llvfs. Allows better dependency analysis. 2009-09-10 21:15:41 +00:00
llviewerregion.cpp svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 2009-10-01 02:35:53 +00:00
llviewerregion.h Fixed a bunch of missing includes and forward declares. I was trying to benchmark with precompiled headers off, but we'll have to do a bunch more cleanup before it's possible to disable that feature cleanly. Not reviewed. 2009-06-23 21:59:31 +00:00
llviewershadermgr.cpp Merging render-pipeline-6-qa-2 into viewer-2 2009-09-22 11:11:45 +00:00
llviewershadermgr.h Merging render-pipeline-6-qa-2 into viewer-2 2009-09-22 11:11:45 +00:00
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 merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
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 svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 2009-10-01 02:35:53 +00:00
llviewertexture.h svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 2009-10-01 02:35:53 +00:00
llviewertextureanim.cpp Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llviewertextureanim.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
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 merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +00:00
llviewerthrottle.cpp Merge of QAR-1383 event-system-7 into trunk. 2009-06-04 16:24:21 +00:00
llviewerthrottle.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llviewervisualparam.cpp merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
llviewervisualparam.h merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
llviewerwindow.cpp merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3 2009-10-01 17:44:44 +00:00
llviewerwindow.h merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1830 https://svn.aws.productengine.com/secondlife/pe/stable-2@1839 -> viewer-2.0.0-3 2009-09-29 19:37:05 +00:00
llvlcomposition.cpp Merging render-pipeline-6-qa-2 into viewer-2 2009-09-22 11:11:45 +00:00
llvlcomposition.h merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +00:00
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 Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llvoavatar.cpp SNOW-194 DEV-40415: pulling this snowglobe patch into viewer 2.0. This 2009-09-25 16:51:25 +00:00
llvoavatar.h Merging render-pipeline-6-qa-2 into viewer-2 2009-09-22 11:11:45 +00:00
llvoavatardefines.cpp merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
llvoavatardefines.h merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
llvoavatarself.cpp Merging down avatar-pipeline/currently-worn-folder-8. Includes fixes for EXT-1121: Attaching / detaching objects doesn't affect the Current Outfit folder, and EXT-1090: Attachments detach on login, as well as work in progress for ensemble support and look details. 2009-09-24 18:05:38 +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 Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llvocache.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llvoclouds.cpp Merging render-pipeline-6-qa-2 into viewer-2 2009-09-22 11:11:45 +00:00
llvoclouds.h merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +00:00
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 merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +00:00
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 merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +00:00
llvoiceclient.cpp merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1830 https://svn.aws.productengine.com/secondlife/pe/stable-2@1839 -> viewer-2.0.0-3 2009-09-29 19:37:05 +00:00
llvoiceclient.h merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1830 https://svn.aws.productengine.com/secondlife/pe/stable-2@1839 -> viewer-2.0.0-3 2009-09-29 19:37:05 +00:00
llvoicevisualizer.cpp merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +00:00
llvoicevisualizer.h merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +00:00
llvoinventorylistener.cpp Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llvoinventorylistener.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llvopartgroup.cpp Merging render-pipeline-6-qa-2 into viewer-2 2009-09-22 11:11:45 +00:00
llvopartgroup.h Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render-9) and QAR-1236 (dll-msvcrt-2) 2009-02-18 21:10:16 +00:00
llvosky.cpp SNOW-194 DEV-40415: pulling this snowglobe patch into viewer 2.0. This 2009-09-25 16:51:25 +00:00
llvosky.h merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +00:00
llvosurfacepatch.cpp Merging render-pipeline-6-qa-2 into viewer-2 2009-09-22 11:11:45 +00:00
llvosurfacepatch.h Merging render-pipeline-6-qa-2 into viewer-2 2009-09-22 11:11:45 +00:00
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 Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llvotree.cpp Merging render-pipeline-6-qa-2 into viewer-2 2009-09-22 11:11:45 +00:00
llvotree.h merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +00:00
llvotreenew.h merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +00:00
llvovolume.cpp svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 2009-10-01 02:35:53 +00:00
llvovolume.h svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 2009-10-01 02:35:53 +00:00
llvowater.cpp Merging render-pipeline-6-qa-2 into viewer-2 2009-09-22 11:11:45 +00:00
llvowater.h merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +00:00
llvowlsky.cpp merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3 2009-08-24 20:04:52 +00:00
llvowlsky.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llwatchdog.cpp Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llwatchdog.h Merged work for DEV-2066 (and formerly QAR-1538) in Viewer 2. 2009-07-16 17:54:58 +00:00
llwaterparammanager.cpp Merging render-pipeline-6-qa-2 into viewer-2 2009-09-22 11:11:45 +00:00
llwaterparammanager.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llwaterparamset.cpp merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +00:00
llwaterparamset.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llwearable.cpp QAR-1602 Checkpoint for Avatar Pipeline Multiple textures branch 2009-07-14 15:14:46 +00:00
llwearable.h QAR-1602 Checkpoint for Avatar Pipeline Multiple textures branch 2009-07-14 15:14:46 +00:00
llwearablelist.cpp merge -r125267:125272 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/inventory-links__merge__viewer2.0.0-3-r125202 to svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3 2009-06-24 21:36:42 +00:00
llwearablelist.h merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
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 Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llwindebug.cpp svn merge -r109009:109164 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-22 2009-02-06 19:45:56 +00:00
llwindebug.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llwlanimator.cpp Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llwlanimator.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llwldaycycle.cpp merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
llwldaycycle.h merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
llwlparammanager.cpp Merging render-pipeline-6-qa-2 into viewer-2 2009-09-22 11:11:45 +00:00
llwlparammanager.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llwlparamset.cpp QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergeme 2009-02-03 17:56:26 +00:00
llwlparamset.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llworld.cpp merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +00:00
llworld.h merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +00:00
llworldmap.cpp Merging render-pipeline-6-qa-2 into viewer-2 2009-09-22 11:11:45 +00:00
llworldmap.h merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +00:00
llworldmapview.cpp Merging render-pipeline-6-qa-2 into viewer-2 2009-09-22 11:11:45 +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 QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergeme 2009-02-03 17:56:26 +00:00
llxmlrpctransaction.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
macmain.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
macutil_Prefix.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
macview.r Print done when done. 2007-01-02 08:33:20 +00:00
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 Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
noise.h Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
pipeline.cpp Merging render-pipeline-6-qa-2 into viewer-2 2009-09-22 11:11:45 +00:00
pipeline.h Merging render-pipeline-6-qa-2 into viewer-2 2009-09-22 11:11:45 +00:00
secondlife-i686.supp Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
secondlife.icns merge viewer/viewer_1-21 94170-94770 -> release 2008-08-28 23:57:41 +00:00
secondlife_firstlook.icns merge viewer/viewer_1-21 94170-94770 -> release 2008-08-28 23:57:41 +00:00
viewer_manifest.py svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 2009-10-01 02:35:53 +00:00