596c52cdf8
Merge with SVN trunk
2009-05-11 14:22:18 -07:00
bafb150f24
Switch the XML file line endings to native.
2009-05-11 21:01:19 +00:00
dc93462991
svn merge -r113003:119136 svn+ssh://svn.lindenlab.com/svn/linden/branches/login-api/login-api-2 svn+ssh://svn.lindenlab.com/svn/linden/branches/login-api/login-api-3
2009-05-11 20:05:46 +00:00
3800c0df91
svn merge -r114679:114681 svn+ssh://svn.lindenlab.com/svn/linden/branches/event-system/event-system-7 svn+ssh://svn.lindenlab.com/svn/linden/branches/event-system/event-system-8
2009-05-08 21:08:08 +00:00
5da967dc74
merge skinning-7 -r 119501-119577 -> viewer-2.0.0-1 *NOTE: This overlaps a little with the skinning-7 -> skinning-8 merge of 119500-119692 -- James
...
ignore-dead-branch
2009-05-08 07:58:49 +00:00
65d90e0e8b
Replaced combo_item with combo_box.item and converted contents labels into label attributes for all translations.
2009-05-08 07:49:43 +00:00
a4000c3744
merge trunk@116587 skinning-7@119389 -> viewer-2.0.0-skinning-7
2009-05-08 07:43:08 +00:00
6c4cadbb04
Update version to 2.0.0.0 !!!
2009-05-08 01:26:20 +00:00
17d940c152
Merge with SVN trunk
2009-05-06 17:00:59 -07:00
cc92525b0d
QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3
...
svn merge -r118927:118939
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.0-merge-2-combo-QAR-1476
this is a composite of...
svn merge -r115088:118182
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-23
conflicts resolved:
C doc/contributions.txt
C indra/llaudio/audioengine.cpp
C indra/newview/CMakeLists.txt
C indra/newview/llfloaterlandholdings.cpp
C indra/newview/llpaneldirbrowser.cpp
C indra/newview/llpanelgrouplandmoney.cpp
C indra/newview/llpreviewscript.cpp
C indra/newview/llviewermenu.cpp
C indra/newview/skins/default/xui/en-us/notifications.xml
and...
svn merge -r116937:118673
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
minor-to-trivial conflicts resolved:
C indra/llcommon/llversionserver.h
C indra/newsim/llrezdata.cpp
C indra/newsim/llstate.cpp
C indra/upgrade/schema_version/sequence/3/index_log_paypal.sql
2009-05-04 17:43:26 +00:00
4bcbf33422
svn merge -r118008:118374 svn+ssh://svn.lindenlab.com/svn/linden/branches/cg/viewer-etch-1
...
QAR-1459 etch builds enabled
2009-04-30 06:52:38 +00:00
324c135273
Merge with SVN trunk
2009-04-28 13:29:04 -07:00
d5aad9ebc3
svn merge -r117696:117697 svn+ssh://svn.lindenlab.com/svn/linden/branches/fix-lslrpc/fix-lslrpc-merge to svn+ssh://svn.lindenlab.com/svn/linden/trunk
2009-04-21 20:08:05 +00:00
e0207fc076
Merge with SVN trunk
2009-04-21 10:34:23 -07:00
9b2d9c6e6e
Retry. Build system fixes for library-library dependencies, ported from skinning-7. OK by CG.
...
svn merge -r117623:117624 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-7
2009-04-20 16:24:21 +00:00
5c2fd1e4fe
Back out last commit, because it breaks mapserver build on linux, dammit.
2009-04-17 22:00:04 +00:00
57b47705d7
Build system fixes for library-library dependencies, ported from skinning-7. OK by CG.
...
svn merge -r117623:117624 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-7
2009-04-17 20:39:07 +00:00
b01c75cb42
svn merge -r117314:117337
...
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1
QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge
2009-04-16 23:45:35 +00:00
868250bdd7
Turn the artwork tree back into a downloaded package, but revision-control
...
the XML files.
2009-04-15 16:36:50 +00:00
7a6577d601
Merge with SVN trunk
2009-04-14 13:22:23 -07:00
9acd242b2e
Missed a file.
2009-04-14 20:10:56 +00:00
87524528a1
Missed a file.
2009-04-14 20:10:56 +00:00
7966bd9b67
Re-add character data.
2009-04-14 20:04:08 +00:00
28ed8f954d
Re-add character data.
2009-04-14 20:04:08 +00:00
664f27380c
merge -r116796:116932 svn+ssh://svn.lindenlab.com/svn/linden/branches/http-texture/http-texture-10
...
DEV-8668 (llkdu) DEV-30348 (set development default channel to LindenDeveloper)
2009-04-13 21:03:44 +00:00
72c5076d6e
Working around DEV-30401 by yanking the etch 32bit build code until the viewer also builds on etch
2009-04-10 01:15:27 +00:00
c7c34d9ad2
Working around DEV-30401 by yanking the etch 32bit build code until the viewer also builds on etch
2009-04-10 01:14:30 +00:00
518afb3ac5
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
1aca3ff6f5
Get 32-bit builds going on 64-bit Debian Etch.
...
Reviewed by Brad.
2009-04-09 18:05:56 +00:00
fa121d8ee1
svn merge -r115000:116937 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
...
Merging from server-1.26 to trunk
Only a few conflicts:
scripts/farm_distribute : the upload rate in trunk was even more
conservative than the one I switched to in
1.26, so kept the trunk version.
indra/llcommon/llversionserver.h : did svn revert to keep trunk
indra/newsim/lltask.cpp : svn is weird. The merge conflict was one
that it's not obvious why it was there.
However, Simon and I looked at it, and the
solution was obvious : keep the trunk blob
where the conflict was flagged.
indra/lib/python : conflict was differing versions of the eventlib
extern. did svn revert . to keep trunk.
2009-04-09 00:20:15 +00:00
2768539bfe
svn merge -r116334:116916 svn+ssh://svn.lindenlab.com/svn/linden/branches/rad-chilies/rad-chilies-trunkmerge-2
2009-04-08 22:39:01 +00:00
1d8b3d92e2
Add .hgignore file
2009-04-07 13:44:01 -07:00
4c3ffdfdda
We must #include <cstring> for memcmp to be found reliably.
2009-04-07 20:17:08 +00:00
3d4e04b556
QAR-1284 ip-takedown tools simulator work is ready for merge
...
svn merge -r115879:116020 svn+ssh://svn.lindenlab.com/svn/linden/branches/dmcat/dmcat-5
no conflicts
2009-04-01 17:11:37 +00:00
a8525c90b9
Move some viewer artwork into a downloadable package.
...
These files haven't been touched in years.
Reviewed by Richard.
2009-03-31 20:37:06 +00:00
8512298921
Removed a newline in string definition - cmake does not support multiline strings
2009-03-27 20:01:23 +00:00
a60c54568c
Result of svn merge -r115238:115240 svn+ssh://svn/svn/linden/branches/trivial-changes/trivial_slave_merge into trunk. In turn a result of svn merge -r113279:113280 svn+ssh://svn/svn/linden/branches/trivial-changes/trivial-changes-1 into trivial_slave_merge and svn merge -r107805:110030 svn+ssh://svn/svn/user/phoenix/slave-ds into trivial_slave_merge. QAR-1329
2009-03-27 19:40:03 +00:00
60afa5c864
Drop an unnecessary sed from linden.mass.
2009-03-27 18:53:37 +00:00
4e570fac98
Use a glob pattern to determine which XUI files to present in IDEs.
...
This is much less painful than maintaining that list by hand, since
we don't use those files for actual builds.
2009-03-26 19:19:18 +00:00
8450fe0da7
Changed LL_VERSION_MINOR to equal 24
2009-03-24 21:19:22 +00:00
43f22fff6f
Result of svn merge -r115023:115025 svn+ssh://svn/svn/linden/branches/no_free_uploads/merge_qa_2 into svn+ssh://svn/svn/linden/trunk for QAR-1220
2009-03-24 19:13:58 +00:00
24b26d71ee
svn merge -r113004:115000 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
...
Merge latest 1.26 into trunk
2009-03-20 20:00:47 +00:00
5dfd435872
svn merge -r 114639:114640 svn+ssh://svn.lindenlab.com/svn/linden/branches/qar-1361
...
Merging in QAR-1361.
2009-03-19 19:18:07 +00:00
733f7d212f
Fix licenseinfo
2009-03-13 22:41:19 +00:00
1aa0416aef
svn merge -r114093:114412 svn+ssh://svn.lindenlab.com/svn/linden/branches/featurettes/featurettes-batch5-merge
...
Melinda (coco): 5th and final batch of featurettes. My work here is done.
2009-03-13 21:28:40 +00:00
7573288ab3
svn merge -r113780:113785
...
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/gst3-t113732
QAR-1333 linux gstreamer compatibility improvements and ADD_BUILD_TEST
improvements - combo merge
2009-03-09 23:42:07 +00:00
2d60d45aea
Trivial stub installer cleanup - resized the dialog, pointed at final URL for slideshow, added final art, fixed UserAgent. Added 1-line comment to llstartup.cpp about updater URL. Going into trunk because it's not tied to a viewer release and the functional code has been through QA elsewhere. OK by Steve/Q. Reviewed with Kelly.
...
svn merge -r113629:113831 svn+ssh://svn.lindenlab.com/svn/linden/branches/windows-setup/windows-setup-4
2009-03-06 22:37:38 +00:00
6f25d31e85
revert revision 113792. wrong branch
2009-03-05 19:27:11 +00:00
30d5d83437
bail if data_size is zero. crashes windows application since it throws an exception. undefined behavior is undefined. DEV-28045
2009-03-05 19:22:07 +00:00
cdbd97c41f
QAR-1293 - Mergeback of changes made in Viewer 1.22 RC10
...
svn merge -r112338-112378 svn+ssh://svn/lindenlab.com/svn/linden/branches/viewer/viewer_1-22
to trunk
2009-03-05 02:05:06 +00:00
Bryan O'Sullivan