| .. |
|
English.lproj
|
Result of svn merge -r64890:69433 svn+ssh://svn/svn/linden/branches/dpo-4 into release. had to blow away the libraries directory to clear up svn evil.
|
2007-09-13 00:51:23 +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
|
merge -r66262:66263 linden/branches/kelly/llgetobjectdetails-2
|
2007-07-26 16:51:08 +00:00 |
|
cursors_mac
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
installers/windows
|
Updated German text as per changes from Christian (Goetze)
|
2007-06-25 22:22:53 +00:00 |
|
linux_tools
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
res
|
revert: svn merge -r 64506:64505 svn+ssh://svn/svn/linden/release back into release
|
2007-06-29 01:49:41 +00:00 |
|
res-sdl
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
skins
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
Info-SecondLife.plist
|
Result of svn merge -r64890:69433 svn+ssh://svn/svn/linden/branches/dpo-4 into release. had to blow away the libraries directory to clear up svn evil.
|
2007-09-13 00:51:23 +00:00 |
|
Info-SecondLifeVorbis.plist
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
VertexCache.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
VorbisFramework.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
featuretable.txt
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
featuretable_linux.txt
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
featuretable_mac.txt
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
featuretable_solaris.txt
|
svn merge -r 64548:64837 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-07-20 20:38:05 +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
|
merge -r62831:64079 branches/maintenance to release
|
2007-06-21 22:40:22 +00:00 |
|
gpu_table.txt
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
licenses-linux.txt
|
svn merge -r 67483:67657 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-1
|
2007-08-14 00:27:49 +00:00 |
|
licenses-mac.txt
|
svn merge -r 67483:67657 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-1
|
2007-08-14 00:27:49 +00:00 |
|
licenses-solaris.txt
|
svn merge -r 67483:67657 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-1
|
2007-08-14 00:27:49 +00:00 |
|
licenses-win32.txt
|
svn merge -r 67483:67657 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-1
|
2007-08-14 00:27:49 +00:00 |
|
llagent.cpp
|
Merge sl-search-opt-in back into the release branch
|
2007-08-30 22:11:52 +00:00 |
|
llagent.h
|
Merge sl-search-opt-in back into the release branch
|
2007-08-30 22:11:52 +00:00 |
|
llagentdata.cpp
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llagentdata.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llagentpilot.cpp
|
Result of svn merge -r57264:57370 svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release.
|
2007-02-02 17:28:58 +00:00 |
|
llagentpilot.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llappearance.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llassetuploadresponders.cpp
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llassetuploadresponders.h
|
svn merge --ignore-ancestry svn+ssh://svn/svn/linden/release@65088 svn+ssh://svn/svn/linden/branches/release-candidate@65078 -> release Paired by Tess and rdw.
|
2007-07-11 21:29:02 +00:00 |
|
llaudiosourcevo.cpp
|
Merge down from Branch_1-18-1:
|
2007-08-02 01:18:34 +00:00 |
|
llaudiosourcevo.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llbox.cpp
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llbox.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llcallbacklist.cpp
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llcallbacklist.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llcallingcard.cpp
|
Merge down from Branch_1-18-1:
|
2007-08-02 01:18:34 +00:00 |
|
llcallingcard.h
|
Result of svn merge -r57264:57370 svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release.
|
2007-02-02 17:28:58 +00:00 |
|
llcaphttpsender.cpp
|
svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate into release
|
2007-05-01 21:39:25 +00:00 |
|
llcaphttpsender.h
|
svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate into release
|
2007-05-01 21:39:25 +00:00 |
|
llchatbar.cpp
|
svn merge -r 67483:67657 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-1
|
2007-08-14 00:27:49 +00:00 |
|
llchatbar.h
|
Merge down from Branch_1-18-1:
|
2007-08-02 01:18:34 +00:00 |
|
llclassifiedinfo.cpp
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llclassifiedinfo.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llcloud.cpp
|
merge release@58699 beta-1-14-0@58707 -> release
|
2007-03-02 21:25:50 +00:00 |
|
llcloud.h
|
merge release@58699 beta-1-14-0@58707 -> release
|
2007-03-02 21:25:50 +00:00 |
|
llcolorswatch.cpp
|
Merge down from Branch_1-18-1:
|
2007-08-02 01:18:34 +00:00 |
|
llcolorswatch.h
|
Merge down from Branch_1-18-1:
|
2007-08-02 01:18:34 +00:00 |
|
llcompilequeue.cpp
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llcompilequeue.h
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llconfirmationmanager.cpp
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llconfirmationmanager.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llcurrencyuimanager.cpp
|
Result of svn merge -r57350:57790 svn+ssh://svn/svn/linden/branches/os-patches.001 into release.
|
2007-02-09 23:35:12 +00:00 |
|
llcurrencyuimanager.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llcylinder.cpp
|
merge release@58699 beta-1-14-0@58707 -> release
|
2007-03-02 21:25:50 +00:00 |
|
llcylinder.h
|
merge release@58699 beta-1-14-0@58707 -> release
|
2007-03-02 21:25:50 +00:00 |
|
lldebugmessagebox.cpp
|
Merge down from Branch_1-18-1:
|
2007-08-02 01:18:34 +00:00 |
|
lldebugmessagebox.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
lldebugview.cpp
|
Merge down from Branch_1-18-1:
|
2007-08-02 01:18:34 +00:00 |
|
lldebugview.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
lldirpicker.cpp
|
SL-53811, SL-53812, SL-53823, SL-26604, SL-54282 Linux filepickers
|
2007-09-10 20:15:48 +00:00 |
|
lldirpicker.h
|
SL-53811, SL-53812, SL-53823, SL-26604, SL-54282 Linux filepickers
|
2007-09-10 20:15:48 +00:00 |
|
lldrawable.cpp
|
merge -r62831:64079 branches/maintenance to release
|
2007-06-21 22:40:22 +00:00 |
|
lldrawable.h
|
svn merge -r 62595:62596 and 62598:63308 sse-skinning-3 for faster software avatar rendering. Visual Studio 2005 project file fixed pending.
|
2007-07-02 23:52:40 +00:00 |
|
lldrawpool.cpp
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
lldrawpool.h
|
svn merge -r 59178:59364 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-03-21 19:36:11 +00:00 |
|
lldrawpoolalpha.cpp
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
lldrawpoolalpha.h
|
merge release@58699 beta-1-14-0@58707 -> release
|
2007-03-02 21:25:50 +00:00 |
|
lldrawpoolavatar.cpp
|
merge -r62831:64079 branches/maintenance to release
|
2007-06-21 22:40:22 +00:00 |
|
lldrawpoolavatar.h
|
merge release@58699 beta-1-14-0@58707 -> release
|
2007-03-02 21:25:50 +00:00 |
|
lldrawpoolbump.cpp
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
lldrawpoolbump.h
|
svn merge -r 59178:59364 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-03-21 19:36:11 +00:00 |
|
lldrawpoolclouds.cpp
|
merge release@58699 beta-1-14-0@58707 -> release
|
2007-03-02 21:25:50 +00:00 |
|
lldrawpoolclouds.h
|
merge release@58699 beta-1-14-0@58707 -> release
|
2007-03-02 21:25:50 +00:00 |
|
lldrawpoolground.cpp
|
svn merge -r 59364:59813 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-03-31 01:41:19 +00:00 |
|
lldrawpoolground.h
|
merge release@58699 beta-1-14-0@58707 -> release
|
2007-03-02 21:25:50 +00:00 |
|
lldrawpoolsimple.cpp
|
svn merge -r 59364:59813 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-03-31 01:41:19 +00:00 |
|
lldrawpoolsimple.h
|
svn merge -r 59178:59364 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-03-21 19:36:11 +00:00 |
|
lldrawpoolsky.cpp
|
svn merge -r 59364:59813 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-03-31 01:41:19 +00:00 |
|
lldrawpoolsky.h
|
svn merge -r 64548:64837 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-07-20 20:38:05 +00:00 |
|
lldrawpoolterrain.cpp
|
svn merge -r 59364:59813 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-03-31 01:41:19 +00:00 |
|
lldrawpoolterrain.h
|
merge release@58699 beta-1-14-0@58707 -> release
|
2007-03-02 21:25:50 +00:00 |
|
lldrawpooltree.cpp
|
merge -r62831:64079 branches/maintenance to release
|
2007-06-21 22:40:22 +00:00 |
|
lldrawpooltree.h
|
merge release@58699 beta-1-14-0@58707 -> release
|
2007-03-02 21:25:50 +00:00 |
|
lldrawpoolwater.cpp
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
lldrawpoolwater.h
|
merge release@58699 beta-1-14-0@58707 -> release
|
2007-03-02 21:25:50 +00:00 |
|
lldriverparam.cpp
|
svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-05-02 21:24:47 +00:00 |
|
lldriverparam.h
|
svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-07-02 17:10:30 +00:00 |
|
lldynamictexture.cpp
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
lldynamictexture.h
|
svn merge -r 59178:59364 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-03-21 19:36:11 +00:00 |
|
llemote.cpp
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llemote.h
|
Merge down from Branch_1-18-1:
|
2007-08-02 01:18:34 +00:00 |
|
lleventinfo.cpp
|
Result of svn merge -r57264:57370 svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release.
|
2007-02-02 17:28:58 +00:00 |
|
lleventinfo.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
lleventnotifier.cpp
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
lleventnotifier.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
lleventpoll.cpp
|
svn merge --ignore-ancestry svn+ssh://svn/svn/linden/release@65088 svn+ssh://svn/svn/linden/branches/release-candidate@65078 -> release Paired by Tess and rdw.
|
2007-07-11 21:29:02 +00:00 |
|
lleventpoll.h
|
svn merge --ignore-ancestry svn+ssh://svn/svn/linden/release@65088 svn+ssh://svn/svn/linden/branches/release-candidate@65078 -> release Paired by Tess and rdw.
|
2007-07-11 21:29:02 +00:00 |
|
llface.cpp
|
svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-07-02 17:10:30 +00:00 |
|
llface.h
|
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-07-18 21:22:40 +00:00 |
|
llface.inl
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llfasttimerview.cpp
|
Merge down from Branch_1-18-1:
|
2007-08-02 01:18:34 +00:00 |
|
llfasttimerview.h
|
merge release@58699 beta-1-14-0@58707 -> release
|
2007-03-02 21:25:50 +00:00 |
|
llfeaturemanager.cpp
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llfeaturemanager.h
|
merge release@58699 beta-1-14-0@58707 -> release
|
2007-03-02 21:25:50 +00:00 |
|
llfilepicker.cpp
|
SL-53811, SL-53812, SL-53823, SL-26604, SL-54282 Linux filepickers
|
2007-09-10 20:15:48 +00:00 |
|
llfilepicker.h
|
SL-53811, SL-53812, SL-53823, SL-26604, SL-54282 Linux filepickers
|
2007-09-10 20:15:48 +00:00 |
|
llfirstuse.cpp
|
Merge down from Branch_1-18-1:
|
2007-08-02 01:18:34 +00:00 |
|
llfirstuse.h
|
Merge down from Branch_1-18-1:
|
2007-08-02 01:18:34 +00:00 |
|
llflexibleobject.cpp
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llflexibleobject.h
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llfloaterabout.cpp
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llfloaterabout.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llfloateranimpreview.cpp
|
Merge down from Branch_1-18-1:
|
2007-08-02 01:18:34 +00:00 |
|
llfloateranimpreview.h
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llfloaterauction.cpp
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llfloaterauction.h
|
merge -r 56779:58057 /branches/selection_management
|
2007-02-17 03:02:16 +00:00 |
|
llfloateravatarpicker.cpp
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llfloateravatarpicker.h
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llfloateravatartextures.cpp
|
svn merge -r 59968:60342 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-04-11 17:54:18 +00:00 |
|
llfloateravatartextures.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llfloaterbuildoptions.cpp
|
Result of svn merge -r57264:57370 svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release.
|
2007-02-02 17:28:58 +00:00 |
|
llfloaterbuildoptions.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llfloaterbump.cpp
|
svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate into release
|
2007-05-01 21:39:25 +00:00 |
|
llfloaterbump.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llfloaterbuy.cpp
|
merge -r61423:62602 svn/branches/maintenance --> release
|
2007-05-30 17:39:09 +00:00 |
|
llfloaterbuy.h
|
merge -r 56779:58057 /branches/selection_management
|
2007-02-17 03:02:16 +00:00 |
|
llfloaterbuycontents.cpp
|
merge -r61423:62602 svn/branches/maintenance --> release
|
2007-05-30 17:39:09 +00:00 |
|
llfloaterbuycontents.h
|
merge -r 56779:58057 /branches/selection_management
|
2007-02-17 03:02:16 +00:00 |
|
llfloaterbuycurrency.cpp
|
svn merge -r 57620:58007 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
|
2007-02-20 22:02:36 +00:00 |
|
llfloaterbuycurrency.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llfloaterbuyland.cpp
|
svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate into release
|
2007-05-01 21:39:25 +00:00 |
|
llfloaterbuyland.h
|
merge -r 56779:58057 /branches/selection_management
|
2007-02-17 03:02:16 +00:00 |
|
llfloaterchat.cpp
|
Merge down from Branch_1-18-1:
|
2007-08-02 01:18:34 +00:00 |
|
llfloaterchat.h
|
Merge down from Branch_1-18-1:
|
2007-08-02 01:18:34 +00:00 |
|
llfloaterchatterbox.cpp
|
Merge down from Branch_1-18-1:
|
2007-08-02 01:18:34 +00:00 |
|
llfloaterchatterbox.h
|
Merge down from Branch_1-18-1:
|
2007-08-02 01:18:34 +00:00 |
|
llfloatercolorpicker.cpp
|
svn merge -r 59234:60086 svn+ssh://svn/svn/linden/branches/live_lsl_help2 -> release
|
2007-04-05 00:59:55 +00:00 |
|
llfloatercolorpicker.h
|
svn merge -r 59234:60086 svn+ssh://svn/svn/linden/branches/live_lsl_help2 -> release
|
2007-04-05 00:59:55 +00:00 |
|
llfloaterfriends.cpp
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llfloaterfriends.h
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llfloatergesture.cpp
|
svn merge -r 62602:62831 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-06-04 18:46:59 +00:00 |
|
llfloatergesture.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llfloatergodtools.cpp
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llfloatergodtools.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llfloatergroupinvite.cpp
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llfloatergroupinvite.h
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llfloatergroups.cpp
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llfloatergroups.h
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llfloaterimagepreview.cpp
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llfloaterimagepreview.h
|
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@62339 svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate62341 -> release
|
2007-05-23 21:17:34 +00:00 |
|
llfloaterinspect.cpp
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llfloaterinspect.h
|
merge -r62831:64079 branches/maintenance to release
|
2007-06-21 22:40:22 +00:00 |
|
llfloaterland.cpp
|
Merge sl-search-m0 back into release
|
2007-09-11 20:48:08 +00:00 |
|
llfloaterland.h
|
Merge sl-search-m0 back into release
|
2007-09-11 20:48:08 +00:00 |
|
llfloaterlandholdings.cpp
|
svn merge -r 61343:61423 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-05-08 22:20:26 +00:00 |
|
llfloaterlandholdings.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llfloatermap.cpp
|
svn merge -r 59826:59968 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-04-04 19:49:24 +00:00 |
|
llfloatermap.h
|
svn merge -r 59826:59968 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-04-04 19:49:24 +00:00 |
|
llfloaternamedesc.cpp
|
Merge down from Branch_1-18-1:
|
2007-08-02 01:18:34 +00:00 |
|
llfloaternamedesc.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llfloateropenobject.cpp
|
merge -r 56779:58057 /branches/selection_management
|
2007-02-17 03:02:16 +00:00 |
|
llfloateropenobject.h
|
merge -r 56779:58057 /branches/selection_management
|
2007-02-17 03:02:16 +00:00 |
|
llfloaterpostcard.cpp
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llfloaterpostcard.h
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llfloaterpreference.cpp
|
Merge down from Branch_1-18-1:
|
2007-08-02 01:18:34 +00:00 |
|
llfloaterpreference.h
|
Merge down from Branch_1-18-1:
|
2007-08-02 01:18:34 +00:00 |
|
llfloaterproperties.cpp
|
svn merge -r59459:59476 svn+ssh://svn.lindenlab.com/svn/linden/branches/adroit.r69-75_2 into svn+ssh://svn.lindenlab.com/svn/linden/release.
|
2007-03-20 22:21:42 +00:00 |
|
llfloaterproperties.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llfloaterregioninfo.cpp
|
Merge sl-search-opt-in back into the release branch
|
2007-08-30 22:11:52 +00:00 |
|
llfloaterregioninfo.h
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llfloaterreporter.cpp
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llfloaterreporter.h
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llfloaterscriptdebug.cpp
|
Merge down from Branch_1-18-1:
|
2007-08-02 01:18:34 +00:00 |
|
llfloaterscriptdebug.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llfloatersellland.cpp
|
A handful of source files had the svn:executable property set. Not any more.
|
2007-04-18 16:52:12 +00:00 |
|
llfloatersellland.h
|
A handful of source files had the svn:executable property set. Not any more.
|
2007-04-18 16:52:12 +00:00 |
|
llfloatersnapshot.cpp
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llfloatersnapshot.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llfloatertelehub.cpp
|
svn merge -r59459:59476 svn+ssh://svn.lindenlab.com/svn/linden/branches/adroit.r69-75_2 into svn+ssh://svn.lindenlab.com/svn/linden/release.
|
2007-03-20 22:21:42 +00:00 |
|
llfloatertelehub.h
|
merge -r 56779:58057 /branches/selection_management
|
2007-02-17 03:02:16 +00:00 |
|
llfloatertools.cpp
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llfloatertools.h
|
Merge down from Branch_1-18-1:
|
2007-08-02 01:18:34 +00:00 |
|
llfloatertopobjects.cpp
|
svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-07-02 17:10:30 +00:00 |
|
llfloatertopobjects.h
|
svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-07-02 17:10:30 +00:00 |
|
llfloatertos.cpp
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llfloatertos.h
|
svn merge -r 56431:56560 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
|
2007-01-08 21:43:30 +00:00 |
|
llfloaterworldmap.cpp
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llfloaterworldmap.h
|
EFFECTIVE MERGE: svn merge -r 65485:66133 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-07-26 01:22:23 +00:00 |
|
llfolderview.cpp
|
svn merge -c 68578 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-3-Viewer --> release
|
2007-09-13 17:48:39 +00:00 |
|
llfolderview.h
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llfollowcam.cpp
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llfollowcam.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llgesturemgr.cpp
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llgesturemgr.h
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llglsandbox.cpp
|
svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-05-02 21:24:47 +00:00 |
|
llgroupmgr.cpp
|
Merge sl-search-opt-in back into the release branch
|
2007-08-30 22:11:52 +00:00 |
|
llgroupmgr.h
|
Merge sl-search-opt-in back into the release branch
|
2007-08-30 22:11:52 +00:00 |
|
llhudeffect.cpp
|
merge release@57486 release-candidate@57503
|
2007-01-31 19:36:32 +00:00 |
|
llhudeffect.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llhudeffectbeam.cpp
|
Result of svn merge -r56700:56797 svn+ssh://svn/svn/linden/branches/more-random into release.
|
2007-01-18 00:44:48 +00:00 |
|
llhudeffectbeam.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llhudeffectlookat.cpp
|
svn merge -r 64468:66735 svn+ssh://svn/svn/linden/branches/lookatyou/indra/newview > release/indra/newview
|
2007-07-31 22:01:05 +00:00 |
|
llhudeffectlookat.h
|
svn merge -r 64468:66735 svn+ssh://svn/svn/linden/branches/lookatyou/indra/newview > release/indra/newview
|
2007-07-31 22:01:05 +00:00 |
|
llhudeffectpointat.cpp
|
corrected, removed, and updated comments throughout the code to be more useful. no code changes. SL-13762
|
2007-01-03 21:05:41 +00:00 |
|
llhudeffectpointat.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llhudeffecttrail.cpp
|
svn merge -r 62602:62831 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-06-04 18:46:59 +00:00 |
|
llhudeffecttrail.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llhudicon.cpp
|
merge -r62831:64079 branches/maintenance to release
|
2007-06-21 22:40:22 +00:00 |
|
llhudicon.h
|
merge -r62831:64079 branches/maintenance to release
|
2007-06-21 22:40:22 +00:00 |
|
llhudmanager.cpp
|
svn merge -r67131:67483 svn+ssh://svn/svn/linden/branches/Branch_1-18-1
|
2007-08-08 00:55:57 +00:00 |
|
llhudmanager.h
|
svn merge -r 64548:64837 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-07-20 20:38:05 +00:00 |
|
llhudobject.cpp
|
svn merge -r67131:67483 svn+ssh://svn/svn/linden/branches/Branch_1-18-1
|
2007-08-08 00:55:57 +00:00 |
|
llhudobject.h
|
svn merge -r67131:67483 svn+ssh://svn/svn/linden/branches/Branch_1-18-1
|
2007-08-08 00:55:57 +00:00 |
|
llhudrender.cpp
|
svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-05-02 21:24:47 +00:00 |
|
llhudrender.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llhudtext.cpp
|
Merge down from Branch_1-18-1:
|
2007-08-02 01:18:34 +00:00 |
|
llhudtext.h
|
merge -r62831:64079 branches/maintenance to release
|
2007-06-21 22:40:22 +00:00 |
|
llhudview.cpp
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llhudview.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llimpanel.cpp
|
Merge down from Branch_1-18-1:
|
2007-08-02 01:18:34 +00:00 |
|
llimpanel.h
|
Merge down from Branch_1-18-1:
|
2007-08-02 01:18:34 +00:00 |
|
llimview.cpp
|
Merge down from Branch_1-18-1:
|
2007-08-02 01:18:34 +00:00 |
|
llimview.h
|
Merge down from Branch_1-18-1:
|
2007-08-02 01:18:34 +00:00 |
|
llinventorybridge.cpp
|
Result of svn merge -r64890:69433 svn+ssh://svn/svn/linden/branches/dpo-4 into release. had to blow away the libraries directory to clear up svn evil.
|
2007-09-13 00:51:23 +00:00 |
|
llinventorybridge.h
|
svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate into release
|
2007-05-01 21:39:25 +00:00 |
|
llinventoryclipboard.cpp
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llinventoryclipboard.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llinventorymodel.cpp
|
Merge down from Branch_1-18-1:
|
2007-08-02 01:18:34 +00:00 |
|
llinventorymodel.h
|
svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-05-02 21:24:47 +00:00 |
|
lljoystickbutton.cpp
|
svn merge -r 59364:59813 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-03-31 01:41:19 +00:00 |
|
lljoystickbutton.h
|
merge release@58699 beta-1-14-0@58707 -> release
|
2007-03-02 21:25:50 +00:00 |
|
lllandmarklist.cpp
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
lllandmarklist.h
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
lllightconstants.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
lllogchat.cpp
|
merge -r62831:64079 branches/maintenance to release
|
2007-06-21 22:40:22 +00:00 |
|
lllogchat.h
|
merge -r62831:64079 branches/maintenance to release
|
2007-06-21 22:40:22 +00:00 |
|
llmanip.cpp
|
merge -r62831:64079 branches/maintenance to release
|
2007-06-21 22:40:22 +00:00 |
|
llmanip.h
|
merge -r 56779:58057 /branches/selection_management
|
2007-02-17 03:02:16 +00:00 |
|
llmaniprotate.cpp
|
merge -r62831:64079 branches/maintenance to release
|
2007-06-21 22:40:22 +00:00 |
|
llmaniprotate.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llmanipscale.cpp
|
merge -r62831:64079 branches/maintenance to release
|
2007-06-21 22:40:22 +00:00 |
|
llmanipscale.h
|
merge -r 56779:58057 /branches/selection_management
|
2007-02-17 03:02:16 +00:00 |
|
llmaniptranslate.cpp
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llmaniptranslate.h
|
merge release@58699 beta-1-14-0@58707 -> release
|
2007-03-02 21:25:50 +00:00 |
|
llmemoryview.cpp
|
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-07-18 21:22:40 +00:00 |
|
llmemoryview.h
|
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-07-18 21:22:40 +00:00 |
|
llmenucommands.cpp
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llmenucommands.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llmorphview.cpp
|
Result of svn merge -r57264:57370 svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release.
|
2007-02-02 17:28:58 +00:00 |
|
llmorphview.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llmoveview.cpp
|
Result of svn merge -r57264:57370 svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release.
|
2007-02-02 17:28:58 +00:00 |
|
llmoveview.h
|
corrected, removed, and updated comments throughout the code to be more useful. no code changes. SL-13762
|
2007-01-03 21:05:41 +00:00 |
|
llmutelist.cpp
|
SL-51287 Muted users not visibly shown anymore
|
2007-09-07 22:31:26 +00:00 |
|
llmutelist.h
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llnamebox.cpp
|
Result of svn merge -r57264:57370 svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release.
|
2007-02-02 17:28:58 +00:00 |
|
llnamebox.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llnameeditor.cpp
|
svn merge -r 59364:59813 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-03-31 01:41:19 +00:00 |
|
llnameeditor.h
|
svn merge -r 59364:59813 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-03-31 01:41:19 +00:00 |
|
llnamelistctrl.cpp
|
svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate into release
|
2007-05-01 21:39:25 +00:00 |
|
llnamelistctrl.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llnetmap.cpp
|
Merge down from Branch_1-18-1:
|
2007-08-02 01:18:34 +00:00 |
|
llnetmap.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
lloverlaybar.cpp
|
Merge down from Branch_1-18-1:
|
2007-08-02 01:18:34 +00:00 |
|
lloverlaybar.h
|
Merge down from Branch_1-18-1:
|
2007-08-02 01:18:34 +00:00 |
|
llpanelavatar.cpp
|
Merge sl-search-opt-in back into the release branch
|
2007-08-30 22:11:52 +00:00 |
|
llpanelavatar.h
|
svn merge -r63705:65463 svn+ssh://svn/svn/linden/branches/dpo-3-bug-fix
|
2007-07-18 01:28:59 +00:00 |
|
llpanelclassified.cpp
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llpanelclassified.h
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llpanelcontents.cpp
|
svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-07-02 17:10:30 +00:00 |
|
llpanelcontents.h
|
svn merge -r 56599:56738 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
|
2007-01-15 18:49:02 +00:00 |
|
llpanelface.cpp
|
svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-07-02 17:10:30 +00:00 |
|
llpanelface.h
|
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@56429 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance@56431
|
2007-01-04 02:04:29 +00:00 |
|
llpanelgroup.cpp
|
Merge sl-search-opt-in back into the release branch
|
2007-08-30 22:11:52 +00:00 |
|
llpanelgroup.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llpanelgroupgeneral.cpp
|
Result of svn merge -r64890:69433 svn+ssh://svn/svn/linden/branches/dpo-4 into release. had to blow away the libraries directory to clear up svn evil.
|
2007-09-13 00:51:23 +00:00 |
|
llpanelgroupgeneral.h
|
Merge sl-search-opt-in back into the release branch
|
2007-08-30 22:11:52 +00:00 |
|
llpanelgroupinvite.cpp
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llpanelgroupinvite.h
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llpanelgrouplandmoney.cpp
|
svn merge -r 62602:62831 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-06-04 18:46:59 +00:00 |
|
llpanelgrouplandmoney.h
|
svn merge -r 61343:61423 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-05-08 22:20:26 +00:00 |
|
llpanelgroupnotices.cpp
|
svn merge -r 62602:62831 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-06-04 18:46:59 +00:00 |
|
llpanelgroupnotices.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llpanelgrouproles.cpp
|
svn merge -r 62602:62831 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-06-04 18:46:59 +00:00 |
|
llpanelgrouproles.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llpanelland.cpp
|
merge -r 56779:58057 /branches/selection_management
|
2007-02-17 03:02:16 +00:00 |
|
llpanelland.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llpanellogin.cpp
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llpanellogin.h
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llpanelobject.cpp
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llpanelobject.h
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llpanelpermissions.cpp
|
Merge sl-search-m0 back into release
|
2007-09-11 20:48:08 +00:00 |
|
llpanelpermissions.h
|
Merge sl-search-m0 back into release
|
2007-09-11 20:48:08 +00:00 |
|
llpanelpick.cpp
|
svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate into release
|
2007-05-01 21:39:25 +00:00 |
|
llpanelpick.h
|
svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate into release
|
2007-05-01 21:39:25 +00:00 |
|
llpanelplace.cpp
|
svn merge -r 59364:59813 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-03-31 01:41:19 +00:00 |
|
llpanelplace.h
|
svn merge -r 59364:59813 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-03-31 01:41:19 +00:00 |
|
llpanelvolume.cpp
|
merge -r 56779:58057 /branches/selection_management
|
2007-02-17 03:02:16 +00:00 |
|
llpanelvolume.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llpatchvertexarray.cpp
|
svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-05-02 21:24:47 +00:00 |
|
llpatchvertexarray.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llpolymesh.cpp
|
svn merge -r 64548:64837 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-07-20 20:38:05 +00:00 |
|
llpolymesh.h
|
svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-07-02 17:10:30 +00:00 |
|
llpolymorph.cpp
|
svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-05-02 21:24:47 +00:00 |
|
llpolymorph.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llpreview.cpp
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llpreview.h
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llpreviewanim.cpp
|
NOTE: Partial merges of the maintenance branch up. The bulk of maintenance 62831:63347 is awaiting final QA and merging, post 1.17.0
|
2007-06-11 18:24:15 +00:00 |
|
llpreviewanim.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llpreviewgesture.cpp
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llpreviewgesture.h
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llpreviewnotecard.cpp
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llpreviewnotecard.h
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llpreviewscript.cpp
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llpreviewscript.h
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llpreviewsound.cpp
|
Merge down from Branch_1-18-1:
|
2007-08-02 01:18:34 +00:00 |
|
llpreviewsound.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llpreviewtexture.cpp
|
Merge down from Branch_1-18-1:
|
2007-08-02 01:18:34 +00:00 |
|
llpreviewtexture.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llprogressview.cpp
|
svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-07-02 17:10:30 +00:00 |
|
llprogressview.h
|
svn merge -r 59364:59813 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-03-31 01:41:19 +00:00 |
|
llregionposition.cpp
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llregionposition.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llresourcedata.h
|
svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-05-02 21:24:47 +00:00 |
|
llsavedsettingsglue.cpp
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llsavedsettingsglue.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llselectmgr.cpp
|
Merge sl-search-opt-in back into the release branch
|
2007-08-30 22:11:52 +00:00 |
|
llselectmgr.h
|
Merge sl-search-opt-in back into the release branch
|
2007-08-30 22:11:52 +00:00 |
|
llsky.cpp
|
merge release@58699 beta-1-14-0@58707 -> release
|
2007-03-02 21:25:50 +00:00 |
|
llsky.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llspatialpartition.cpp
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llspatialpartition.h
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llsprite.cpp
|
merge release@58699 beta-1-14-0@58707 -> release
|
2007-03-02 21:25:50 +00:00 |
|
llsprite.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llsrv.cpp
|
svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-07-02 17:10:30 +00:00 |
|
llsrv.h
|
svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-07-02 17:10:30 +00:00 |
|
llstartup.cpp
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llstartup.h
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llstatusbar.cpp
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llstatusbar.h
|
Merge down from Branch_1-18-1:
|
2007-08-02 01:18:34 +00:00 |
|
llsurface.cpp
|
merge release@58699 beta-1-14-0@58707 -> release
|
2007-03-02 21:25:50 +00:00 |
|
llsurface.h
|
merge release@58699 beta-1-14-0@58707 -> release
|
2007-03-02 21:25:50 +00:00 |
|
llsurfacepatch.cpp
|
svn merge -r 59968:60342 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-04-11 17:54:18 +00:00 |
|
llsurfacepatch.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
lltable.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
lltexlayer.cpp
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
lltexlayer.h
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
lltexturecache.cpp
|
merge -r62831:64079 branches/maintenance to release
|
2007-06-21 22:40:22 +00:00 |
|
lltexturecache.h
|
svn merge -r 59178:59364 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-03-21 19:36:11 +00:00 |
|
lltexturectrl.cpp
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
lltexturectrl.h
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
lltexturefetch.cpp
|
merge -r62831:64079 branches/maintenance to release
|
2007-06-21 22:40:22 +00:00 |
|
lltexturefetch.h
|
svn merge -r 59178:59364 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-03-21 19:36:11 +00:00 |
|
lltextureview.cpp
|
svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-07-02 17:10:30 +00:00 |
|
lltextureview.h
|
svn merge -r 59178:59364 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-03-21 19:36:11 +00:00 |
|
lltool.cpp
|
svn merge -r 59364:59813 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-03-31 01:41:19 +00:00 |
|
lltool.h
|
svn merge -r 59364:59813 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-03-31 01:41:19 +00:00 |
|
lltoolbar.cpp
|
Merge down from Branch_1-18-1:
|
2007-08-02 01:18:34 +00:00 |
|
lltoolbar.h
|
Merge down from Branch_1-18-1:
|
2007-08-02 01:18:34 +00:00 |
|
lltoolbrush.cpp
|
svn merge --ignore-ancestry svn+ssh://svn/svn/linden/release@65088 svn+ssh://svn/svn/linden/branches/release-candidate@65078 -> release Paired by Tess and rdw.
|
2007-07-11 21:29:02 +00:00 |
|
lltoolbrush.h
|
svn merge --ignore-ancestry svn+ssh://svn/svn/linden/release@65088 svn+ssh://svn/svn/linden/branches/release-candidate@65078 -> release Paired by Tess and rdw.
|
2007-07-11 21:29:02 +00:00 |
|
lltoolcomp.cpp
|
merge -r62831:64079 branches/maintenance to release
|
2007-06-21 22:40:22 +00:00 |
|
lltoolcomp.h
|
merge -r 56779:58057 /branches/selection_management
|
2007-02-17 03:02:16 +00:00 |
|
lltooldraganddrop.cpp
|
Merge down from Branch_1-18-1:
|
2007-08-02 01:18:34 +00:00 |
|
lltooldraganddrop.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
lltoolface.cpp
|
merge -r 56779:58057 /branches/selection_management
|
2007-02-17 03:02:16 +00:00 |
|
lltoolface.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
lltoolfocus.cpp
|
merge release@58699 beta-1-14-0@58707 -> release
|
2007-03-02 21:25:50 +00:00 |
|
lltoolfocus.h
|
merge -r 56779:58057 /branches/selection_management
|
2007-02-17 03:02:16 +00:00 |
|
lltoolgrab.cpp
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
lltoolgrab.h
|
merge -r 56779:58057 /branches/selection_management
|
2007-02-17 03:02:16 +00:00 |
|
lltoolgun.cpp
|
merge -r 56779:58057 /branches/selection_management
|
2007-02-17 03:02:16 +00:00 |
|
lltoolgun.h
|
merge -r 56779:58057 /branches/selection_management
|
2007-02-17 03:02:16 +00:00 |
|
lltoolindividual.cpp
|
merge -r 56779:58057 /branches/selection_management
|
2007-02-17 03:02:16 +00:00 |
|
lltoolindividual.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
lltoolmgr.cpp
|
merge -r61423:62602 svn/branches/maintenance --> release
|
2007-05-30 17:39:09 +00:00 |
|
lltoolmgr.h
|
merge -r 56779:58057 /branches/selection_management
|
2007-02-17 03:02:16 +00:00 |
|
lltoolmorph.cpp
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
lltoolmorph.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
lltoolobjpicker.cpp
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
lltoolobjpicker.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
lltoolpie.cpp
|
svn merge -r 64468:66735 svn+ssh://svn/svn/linden/branches/lookatyou/indra/newview > release/indra/newview
|
2007-07-31 22:01:05 +00:00 |
|
lltoolpie.h
|
merge -r62831:64079 branches/maintenance to release
|
2007-06-21 22:40:22 +00:00 |
|
lltoolpipette.cpp
|
A handful of source files had the svn:executable property set. Not any more.
|
2007-04-18 16:52:12 +00:00 |
|
lltoolpipette.h
|
A handful of source files had the svn:executable property set. Not any more.
|
2007-04-18 16:52:12 +00:00 |
|
lltoolplacer.cpp
|
merge release@58699 beta-1-14-0@58707 -> release
|
2007-03-02 21:25:50 +00:00 |
|
lltoolplacer.h
|
merge release@58699 beta-1-14-0@58707 -> release
|
2007-03-02 21:25:50 +00:00 |
|
lltoolselect.cpp
|
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-07-18 21:22:40 +00:00 |
|
lltoolselect.h
|
merge -r 58285:58437 maintenance.
|
2007-02-27 01:03:39 +00:00 |
|
lltoolselectland.cpp
|
svn merge -r 62602:62831 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-06-04 18:46:59 +00:00 |
|
lltoolselectland.h
|
merge -r 56779:58057 /branches/selection_management
|
2007-02-17 03:02:16 +00:00 |
|
lltoolselectrect.cpp
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
lltoolselectrect.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
lltoolview.cpp
|
merge -r 56779:58057 /branches/selection_management
|
2007-02-17 03:02:16 +00:00 |
|
lltoolview.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
lltracker.cpp
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
lltracker.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
lluiconstants.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
lluploaddialog.cpp
|
svn merge -r 59364:59813 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-03-31 01:41:19 +00:00 |
|
lluploaddialog.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llurl.cpp
|
Result of svn merge -r57264:57370 svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release.
|
2007-02-02 17:28:58 +00:00 |
|
llurl.h
|
Result of svn merge -r57264:57370 svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release.
|
2007-02-02 17:28:58 +00:00 |
|
llurlwhitelist.cpp
|
merge release@58791 vc8@58828 -> release
|
2007-03-07 02:48:44 +00:00 |
|
llurlwhitelist.h
|
merge release@58791 vc8@58828 -> release
|
2007-03-07 02:48:44 +00:00 |
|
llviewchildren.cpp
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llviewchildren.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llviewerassetstorage.cpp
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llviewerassetstorage.h
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llviewercamera.cpp
|
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@62339 svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate62341 -> release
|
2007-05-23 21:17:34 +00:00 |
|
llviewercamera.h
|
svn merge -r 59968:60342 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-04-11 17:54:18 +00:00 |
|
llviewercontrol.cpp
|
svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-05-02 21:24:47 +00:00 |
|
llviewercontrol.h
|
Merge down from Branch_1-18-1:
|
2007-08-02 01:18:34 +00:00 |
|
llviewerdisplay.cpp
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llviewerdisplay.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llviewergenericmessage.cpp
|
svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate into release
|
2007-05-01 21:39:25 +00:00 |
|
llviewergenericmessage.h
|
svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate into release
|
2007-05-01 21:39:25 +00:00 |
|
llviewergesture.cpp
|
svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate into release
|
2007-05-01 21:39:25 +00:00 |
|
llviewergesture.h
|
svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate into release
|
2007-05-01 21:39:25 +00:00 |
|
llviewerinventory.cpp
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llviewerinventory.h
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llviewerjoint.cpp
|
svn merge -r 59178:59364 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-03-21 19:36:11 +00:00 |
|
llviewerjoint.h
|
merge release@58699 beta-1-14-0@58707 -> release
|
2007-03-02 21:25:50 +00:00 |
|
llviewerjointattachment.cpp
|
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-07-18 21:22:40 +00:00 |
|
llviewerjointattachment.h
|
svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-07-02 17:10:30 +00:00 |
|
llviewerjointmesh.cpp
|
svn merge -r 64548:64837 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-07-20 20:38:05 +00:00 |
|
llviewerjointmesh.h
|
svn merge -r 62595:62596 and 62598:63308 sse-skinning-3 for faster software avatar rendering. Visual Studio 2005 project file fixed pending.
|
2007-07-02 23:52:40 +00:00 |
|
llviewerjointmesh_sse.cpp
|
svn merge --ignore-ancestry svn+ssh://svn/svn/linden/release@65088 svn+ssh://svn/svn/linden/branches/release-candidate@65078 -> release Paired by Tess and rdw.
|
2007-07-11 21:29:02 +00:00 |
|
llviewerjointmesh_sse2.cpp
|
Fix build borkage on OS X.
|
2007-07-12 22:33:48 +00:00 |
|
llviewerjointmesh_vec.cpp
|
svn merge --ignore-ancestry svn+ssh://svn/svn/linden/release@65088 svn+ssh://svn/svn/linden/branches/release-candidate@65078 -> release Paired by Tess and rdw.
|
2007-07-11 21:29:02 +00:00 |
|
llviewerjoystick.cpp
|
svn merge -r 59364:59813 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-03-31 01:41:19 +00:00 |
|
llviewerjoystick.h
|
svn merge -r 59364:59813 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-03-31 01:41:19 +00:00 |
|
llviewerkeyboard.cpp
|
merge -r62831:64079 branches/maintenance to release
|
2007-06-21 22:40:22 +00:00 |
|
llviewerkeyboard.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llviewerlayer.cpp
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llviewerlayer.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llviewermenu.cpp
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llviewermenu.h
|
svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-05-02 21:24:47 +00:00 |
|
llviewermenufile.cpp
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llviewermenufile.h
|
svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-05-02 21:24:47 +00:00 |
|
llviewermessage.cpp
|
svn merge -c 68568 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-3-Viewer --> release
|
2007-09-13 17:21:21 +00:00 |
|
llviewermessage.h
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llviewernetwork.cpp
|
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@59161 svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate@59163 --> release
|
2007-03-14 23:03:50 +00:00 |
|
llviewernetwork.h
|
svn merge --ignore-ancestry svn+ssh://svn/svn/linden/release@65088 svn+ssh://svn/svn/linden/branches/release-candidate@65078 -> release Paired by Tess and rdw.
|
2007-07-11 21:29:02 +00:00 |
|
llviewerobject.cpp
|
Merge sl-search-opt-in back into the release branch
|
2007-08-30 22:11:52 +00:00 |
|
llviewerobject.h
|
Merge sl-search-opt-in back into the release branch
|
2007-08-30 22:11:52 +00:00 |
|
llviewerobjectlist.cpp
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llviewerobjectlist.h
|
merge release@58699 beta-1-14-0@58707 -> release
|
2007-03-02 21:25:50 +00:00 |
|
llviewerparcelmgr.cpp
|
Merge down from Branch_1-18-1:
|
2007-08-02 01:18:34 +00:00 |
|
llviewerparcelmgr.h
|
revert: svn merge -r 64506:64505 svn+ssh://svn/svn/linden/release back into release
|
2007-06-29 01:49:41 +00:00 |
|
llviewerparceloverlay.cpp
|
svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-05-02 21:24:47 +00:00 |
|
llviewerparceloverlay.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llviewerpartsim.cpp
|
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-07-18 21:22:40 +00:00 |
|
llviewerpartsim.h
|
svn merge -r 62602:62831 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-06-04 18:46:59 +00:00 |
|
llviewerpartsource.cpp
|
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-07-18 21:22:40 +00:00 |
|
llviewerpartsource.h
|
merge -r62831:64079 branches/maintenance to release
|
2007-06-21 22:40:22 +00:00 |
|
llviewerprecompiledheaders.cpp
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llviewerprecompiledheaders.h
|
merge -r 66233:67472 svn+ssh://svn/svn/linden/branches/het-grid-4 Paired by Tess and Leyla.
|
2007-08-10 02:15:37 +00:00 |
|
llviewerregion.cpp
|
Merge sl-search-opt-in back into the release branch
|
2007-08-30 22:11:52 +00:00 |
|
llviewerregion.h
|
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-07-18 21:22:40 +00:00 |
|
llviewerstats.cpp
|
svn merge -r67650:68653 branches/release-viewer-stats
|
2007-08-29 00:08:01 +00:00 |
|
llviewerstats.h
|
svn merge -r67650:68653 branches/release-viewer-stats
|
2007-08-29 00:08:01 +00:00 |
|
llviewertexteditor.cpp
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llviewertexteditor.h
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llviewertextureanim.cpp
|
svn merge -r 59364:59813 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-03-31 01:41:19 +00:00 |
|
llviewertextureanim.h
|
svn merge -r 59364:59813 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-03-31 01:41:19 +00:00 |
|
llviewerthrottle.cpp
|
merge -r 59337:59951 Branch_1-14-0 -> release.
|
2007-04-03 00:16:59 +00:00 |
|
llviewerthrottle.h
|
Result of svn merge -r57264:57370 svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release.
|
2007-02-02 17:28:58 +00:00 |
|
llviewervisualparam.cpp
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llviewervisualparam.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llviewerwindow.cpp
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llviewerwindow.h
|
Merge down from Branch_1-18-1:
|
2007-08-02 01:18:34 +00:00 |
|
llvlcomposition.cpp
|
svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-05-02 21:24:47 +00:00 |
|
llvlcomposition.h
|
merge -r 56738:56842 maintenance.
|
2007-01-18 00:36:25 +00:00 |
|
llvlmanager.cpp
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llvlmanager.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llvoavatar.cpp
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llvoavatar.h
|
Merge down from Branch_1-18-1:
|
2007-08-02 01:18:34 +00:00 |
|
llvocache.cpp
|
svn merge -r 64548:64837 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-07-20 20:38:05 +00:00 |
|
llvocache.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llvoclouds.cpp
|
svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-05-02 21:24:47 +00:00 |
|
llvoclouds.h
|
svn merge -r 62602:62831 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-06-04 18:46:59 +00:00 |
|
llvograss.cpp
|
svn merge -r 64548:64837 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-07-20 20:38:05 +00:00 |
|
llvograss.h
|
svn merge -r 62602:62831 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-06-04 18:46:59 +00:00 |
|
llvoground.cpp
|
merge release@58699 beta-1-14-0@58707 -> release
|
2007-03-02 21:25:50 +00:00 |
|
llvoground.h
|
svn merge -r 62602:62831 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-06-04 18:46:59 +00:00 |
|
llvoiceclient.cpp
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llvoiceclient.h
|
svn merge -r 67483:67657 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-1
|
2007-08-14 00:27:49 +00:00 |
|
llvoicevisualizer.cpp
|
Merge down from Branch_1-18-1:
|
2007-08-02 01:18:34 +00:00 |
|
llvoicevisualizer.h
|
Merge down from Branch_1-18-1:
|
2007-08-02 01:18:34 +00:00 |
|
llvoinventorylistener.cpp
|
merge -r62831:64079 branches/maintenance to release
|
2007-06-21 22:40:22 +00:00 |
|
llvoinventorylistener.h
|
Merge fix for SL-46373 / VWR-1369 / Intermittent Crash on Edit from Pie Menu
|
2007-06-26 18:27:02 +00:00 |
|
llvopartgroup.cpp
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llvopartgroup.h
|
merge -r62831:64079 branches/maintenance to release
|
2007-06-21 22:40:22 +00:00 |
|
llvosky.cpp
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llvosky.h
|
svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-07-02 17:10:30 +00:00 |
|
llvosurfacepatch.cpp
|
svn merge -r 59968:60342 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-04-11 17:54:18 +00:00 |
|
llvosurfacepatch.h
|
merge -r62831:64079 branches/maintenance to release
|
2007-06-21 22:40:22 +00:00 |
|
llvotextbubble.cpp
|
merge release@58699 beta-1-14-0@58707 -> release
|
2007-03-02 21:25:50 +00:00 |
|
llvotextbubble.h
|
svn merge -r 62602:62831 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-06-04 18:46:59 +00:00 |
|
llvotree.cpp
|
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-07-18 21:22:40 +00:00 |
|
llvotree.h
|
merge -r62831:64079 branches/maintenance to release
|
2007-06-21 22:40:22 +00:00 |
|
llvotreenew.h
|
Result of svn merge -r56700:56797 svn+ssh://svn/svn/linden/branches/more-random into release.
|
2007-01-18 00:44:48 +00:00 |
|
llvovolume.cpp
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llvovolume.h
|
merge -r62831:64079 branches/maintenance to release
|
2007-06-21 22:40:22 +00:00 |
|
llvowater.cpp
|
merge release@58699 beta-1-14-0@58707 -> release
|
2007-03-02 21:25:50 +00:00 |
|
llvowater.h
|
svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-07-02 17:10:30 +00:00 |
|
llwearable.cpp
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llwearable.h
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llwearablelist.cpp
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llwearablelist.h
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
llweb.cpp
|
svn merge -r 64548:64837 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-07-20 20:38:05 +00:00 |
|
llweb.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llwind.cpp
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llwind.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llwindebug.cpp
|
svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-05-02 21:24:47 +00:00 |
|
llwindebug.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
llworld.cpp
|
svn merge --ignore-ancestry svn+ssh://svn/svn/linden/release@65088 svn+ssh://svn/svn/linden/branches/release-candidate@65078 -> release Paired by Tess and rdw.
|
2007-07-11 21:29:02 +00:00 |
|
llworld.h
|
svn merge -r 59364:59813 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-03-31 01:41:19 +00:00 |
|
llworldmap.cpp
|
EFFECTIVE MERGE: svn merge -r 65485:66133 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-07-26 01:22:23 +00:00 |
|
llworldmap.h
|
EFFECTIVE MERGE: svn merge -r 65485:66133 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-07-26 01:22:23 +00:00 |
|
llworldmapview.cpp
|
Merge down from Branch_1-18-1:
|
2007-08-02 01:18:34 +00:00 |
|
llworldmapview.h
|
merge release@58699 beta-1-14-0@58707 -> release
|
2007-03-02 21:25:50 +00:00 |
|
llxmlrpctransaction.cpp
|
svn merge -r 64548:64837 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-07-20 20:38:05 +00:00 |
|
llxmlrpctransaction.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
macmain.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
macutil_Prefix.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
macview.r
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
macview_Prefix.h
|
merge release@58699 beta-1-14-0@58707 -> release
|
2007-03-02 21:25:50 +00:00 |
|
noise.cpp
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
noise.h
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
pipeline.cpp
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
pipeline.h
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
|
secondlife-i686.supp
|
svn merge -r 62602:62831 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-06-04 18:46:59 +00:00 |
|
secondlife.icns
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |
|
viewer_manifest.py
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-08-21 22:17:53 +00:00 |
a5f3ac2a8d