ea86bb88c3
first pass merge
2013-02-04 10:52:32 -08:00
ee7bf28a04
Make --jobs option work on OS X with Xcode 4.
2013-01-21 15:35:11 -06:00
5c3130fa40
Added compiler swith for Linux to override autodetected number of compile jobs - Followup - typo fix
2013-01-21 11:50:00 +01:00
f3abe0e35e
Added compiler swith for Linux to override autodetected number of compile jobs. Prevents issues on processors that report a lot of cores but only have hyperthreading, also can save memory while compiling.
2013-01-21 11:34:40 +01:00
a6df1b36c2
FIRE-8231: Fix compiling on Mountain Lion (OS X 10.8). Found by Shin Wasp.
2012-11-16 14:25:21 -06:00
d145a7701f
FIRE-8063: Add Open Region Settings panel to the Region Info floater for aurora-sim; Add IsInAuroraSim() to fsgridhandler
2012-10-28 14:23:32 -06:00
f6898ac3e6
Clean build robustness and line formatting fixes
2012-09-15 11:51:08 -04:00
4b4e14ab27
Only unfocus the main chat bar if deselect chat is enabled.
2012-02-04 23:19:51 +01:00
066d63022b
fix typo in flag for -u option
2011-10-06 16:30:32 -04:00
466b9d7aeb
add --diff option to display change report, other minor improvements
2011-09-23 10:18:01 -04:00
0665d3f2e6
lowercase gpu string and recognizers in gpu_table_tester to match the behavior of the real code
2011-09-13 10:51:31 -04:00
5b42f6f25b
modify gpu_table_tester to lowercase things the way that the real gpu table parser does
2011-09-13 10:00:03 -04:00
3958c5fe71
make script executable
2011-09-12 12:10:46 -04:00
9df77524fc
only include the h file when it is being created, and make the #endif in the h file safer for picky compilers
2011-09-12 07:21:22 -04:00
49d0e291d8
add templates for use with hg-tools/create.py
2011-09-11 10:01:38 -04:00
d6f7526abf
Merge
2011-05-24 14:28:25 -07:00
5eb6cb8d86
merge up latest viewer-development (post mesh)
2011-05-18 07:33:08 -04:00
0a86e39d90
Merge with viewer-development (mesh)
2011-05-17 21:01:36 +00:00
27fd0d1a93
storm-1100: merged many more updates and refinements to table, added tester and files to test with
2011-05-13 13:27:56 -04:00
37c15d211b
Merge
2011-04-05 10:36:41 -07:00
a03f6997d8
update message template hash to correct value
2011-04-01 12:08:03 -04:00
d0ba2bc847
pull latest changes from viewer-development
2011-04-01 09:52:37 -04:00
cf4d929888
STORM-956 update message template
2011-04-01 06:49:19 -04:00
6540ccd307
Updated message template hash.
2011-03-31 16:15:48 -07:00
44ad672b9e
Apply server side code to message template verification onto the viewer tree.
2011-03-31 15:43:47 -07:00
0080ed8e29
Merge
2011-03-31 14:07:54 -07:00
675e0cfd99
Use tcmalloc from 3p-google-perftools on windows
2011-04-11 14:12:49 -05:00
47781184fc
Automated merge up from viewer-development into mesh-development
2011-04-04 10:42:52 -04:00
f360ce118d
Add template .sha1
2011-03-03 12:14:10 -08:00
6e97ead181
Add early exit to message template check if it hasn't changed.
2011-03-03 12:05:40 -08:00
dfafbf9f12
Automated merge up from viewer-development into mesh-development
2011-02-18 10:23:08 -05:00
c190189057
merge changes for storm-937
2011-02-17 14:56:33 -05:00
10cf492ef1
STORM-937 : Use subprocess instead os commands in python, suppress crufty svn code
2011-02-11 16:56:28 -08:00
896bc12a2b
STORM-937 : Fix python scripts shebang line and license header for consistency
2011-02-09 15:23:07 -08:00
01dd9929e2
STORM-937 : Makes all python paths use consistent syntax
2011-01-28 16:00:57 -08:00
e4392e6ae9
bye bye install.py...
2011-01-14 15:38:30 -08:00
5f99331f4a
Automated merge up from viewer-development
2010-12-29 13:23:02 -05:00
429e0caf17
SNOW-744: scripts/install.py --uninstall does not remove symbolic links.
...
This fixes the problem that when some package contains symbolic
links, they were never removed anymore (after an uninstall of
that package).
2010-12-15 17:31:18 +01:00
bfd8efb057
Automated merge up from viewer-development
2010-12-01 10:55:24 -05:00
0670e889f9
Replace template verification code with an md5sum check.
2010-11-16 12:15:00 -08:00
affb24b4f6
FIRE-3974; Don't let newlines sneak into LL_CHANNEL.
2011-12-12 21:33:13 +01:00
8f8922b1d6
OS X Lion build fix: remove GCC_VERSION=4.2 only if building on Lion.
2011-11-08 21:22:47 -06:00
8092fcf434
FIRE-3718, more robust hostname lookup, spelling fixes in configure_Firestorm.py. Thanks Miguael Liamano
2011-10-29 01:12:59 -04:00
7394730eaa
Merge up to LL FUI
2011-10-28 02:00:09 -04:00
7fb04b35f3
Take2, make sure we clean up skin & resource files when packaging.
2011-10-22 10:23:16 -04:00
d731bb3744
Backing package-clean work out for now.
2011-10-21 13:03:04 -04:00
650d3ba62d
Updates to last commit, more robust across platforms
2011-10-21 12:58:23 -04:00
68d22220fb
Clear previously packaged resource files prior to each 'package' build.
2011-10-21 11:17:00 -04:00
fc3eaffc0d
Always replace old build logs, even on quick rebuilds
2011-10-09 20:46:00 -04:00
5ae11b0677
Fix version number in OS X Get Info.
...
The version number in this patch will get overlaid during the build process.
2011-09-04 12:40:16 -05:00
a4d4b6fb6a
Fix bug in configure_firestorm.sh --clean
2011-08-29 22:38:48 -04:00
c802ea2279
ReleaseFS autobuild target improvements. No package by default, better --btype parsing
2011-08-27 23:25:13 -04:00
8d9fba43b9
Firestorm merge catchup
2011-08-27 06:00:46 -04:00
9fd0edb326
Initial 2.8.3+ merge, Tozh & Arrehn
...
Issues: Graphics preferences tab, lighting, depth of field
Issues: Color preferences tab, new direct chat
Issues: Build floater Mesh build tab
Issues: German translations of build, viewer menus
Issues: pipeline issues with mac, possibly other things
Issues: uploading content / temp content
Issues: Windlight quickprefs, parcel windlight, RLVa windlight
2011-08-26 11:18:49 -04:00
5f80dbef9e
FS Autobuild improvements: support for RelWithDebInfoFS_open, LL-style config options, more documentation
2011-08-19 20:48:34 -04:00
ca285b12f4
FIRE-2555: Fix private channel on windows builds
2011-08-17 11:49:35 -04:00
39c1e03382
Recreate log directories after clean targets
2011-08-14 16:53:55 -04:00
e23b163acf
MacOSX Lion build compatibility & adjustments, adapted from Mimika Oh
2011-08-14 12:08:44 -04:00
2338d9ce8f
Set default StartupProject, Workingdir and Configuration for Windows builds
...
This sets this three values to match the "autobuild build" command.
2011-08-13 01:04:57 +02:00
e67e6ed7c2
Fix Mac OS X Info.plist versioning.
2011-08-08 19:57:04 -05:00
afe5c530b9
Use ".in" files for source files that contain build-specific data.
2011-08-08 07:41:56 -04:00
98cbc601d8
configure script typo, correction from Satomi Ahn
2011-08-07 15:17:14 -04:00
6350754357
Remove unnecessary build flag
2011-08-06 01:30:39 -07:00
2676fe01d3
Adding in "ReleaseFS_open' autobuild target for non-kdu builds. Documentation & cleaning fixes.
2011-08-06 08:36:02 -04:00
61cb88c510
Mini-merge up to FS-tip. Note: Reverted OSX Lion build sdk changes, due to failure to produce a viable build on snowleopard.
2011-08-05 11:35:59 -04:00
e277b8a4ac
Merge with LL 2.6.9, initial work. Needs tests, extra XUI merging with particular skins.
2011-08-04 11:53:40 -04:00
f3673a5760
- added : version information to llcommon.dll
2011-05-15 20:21:08 +02:00
c5492c6fea
Merged with Appearance-MixedViewers tip
...
--HG--
branch : .RLVa
2011-03-19 12:33:15 +01:00
593639b176
Merged with default tip (Revision e5176946eb04)
...
--HG--
branch : .RLVa
2011-02-17 16:09:01 +01:00
076d0f47e7
Merged with Viewer-Build tip
...
--HG--
branch : .RLVa
2010-12-05 01:44:08 +01:00
7687653871
Automated merge up from viewer-development
2010-10-20 12:18:33 -04:00
a5619d16f7
correct licenses (fix problem with license change merge)
2010-10-13 07:24:37 -04:00
a4b223248e
Merge
2010-09-27 17:54:52 -07:00
7c2b9221d6
merge
2010-09-27 15:20:27 -05:00
90e3d83a5c
Fix for build failures - disabling tcmalloc for now
2010-09-21 13:26:52 -04:00
ffae589843
Post-convert merge by convert_monolith.py from /Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution
2010-09-03 17:41:39 +01:00
e68f9e566b
merge
2010-08-31 16:37:40 -05:00
a36033853a
STORM-168 : Python modules cleanup
2010-09-16 14:27:42 -07:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
f0d3cfc7bb
Unix EOL
2010-07-09 17:48:27 -07:00
3733337011
Gravity, Friction, Restitution, Density now work with simulator.
2010-07-09 17:47:58 -07:00
2530b057bb
added new physics parameters to prims
2010-07-01 17:18:55 -05:00
71dfe17fd1
Updated to latest MoneyBalanceReply message format
2010-04-02 09:45:17 -07:00
7381679cd0
Add TransactionInfo to MoneyBalanceReply, unpack test data
2010-04-01 10:15:37 -07:00
b2381a039d
DEV-47845 Cleaned up names.
2010-03-31 17:35:26 -07:00
92257b55a4
DEV-47845 Fix to work with TCP/LLSD message. This checkin is experimental, so if it breaks a build, just revert to the previous changeset.
2010-03-26 18:23:05 -07:00
96f29d2ba0
Update message template to agree with server-1-36
2010-02-11 18:58:33 -05:00
5fc9d8bdda
Remove a tab character from the end of a line to pass policy requirements.
2010-01-20 11:46:40 -08:00
c252f122e3
DEV-45037 Attackers can request files from viewer cache
2010-01-19 19:42:13 -06:00
5c0f263403
Replace scripts dependency on win32api module with bundled ctypes.
2010-01-14 16:46:20 -05:00
66cf090114
Adding new option definition - forgot.
2009-11-06 15:54:11 -08:00
99f75c9bca
Add support for externally specified revision number (codeticket)
2009-11-06 15:52:51 -08:00
65bf35cfed
merge
2009-10-19 10:49:48 -07:00
477c2acffa
Cosmetic change. Took out unnecessary blank line near the end of LinkInventoryItem in message_template.msg.
2009-10-16 20:40:16 +00:00
bc4444cd78
Merge into viewer/viewer-20 yesterday's lindenlab/svn-imports-viewer-20
2009-09-26 18:08:24 -04:00
053b14a97a
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.
...
Merging revisions 131698-132325 of svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/newinventorymsg__merge__viewer-2.0.0-3__r131585 into D:\viewer-2.0.0-3, respecting ancestry
2009-09-17 16:53:36 +00:00
5b428d3a63
Merge with SVN trunk
2009-09-08 12:25:35 -07:00
74e584add6
svn merge -r132607:132665 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.30
...
Propagating to trunk: QAR-1705 DEV-29573 QAR-1859 QAR-1804
2009-09-04 18:16:21 +00:00
ff11d74820
Add Mercurial-specific build version info.
...
Pilfered from billc.
2009-08-26 10:57:38 -07:00
2c31217cc9
svn merge -c 128669 svn+ssh://svn.lindenlab.com/svn/linden/branches/bots/sisa-4
...
Pulled all the sisa changes into trunk for QAR-1734
These changes are the same as revisions 126447:126495 from svn+ssh://svn.lindenlab.com/svn/linden/branches/bots/sisa-2
or the one merge branch in
svn+ssh://svn.lindenlab.com/svn/linden/branches/bots/sisa-3
2009-07-29 17:36:46 +00:00
17b9cda432
For QAR-1710 : Server merge for QAR-1594 QAR-1643 QAR-1644 - "AVP Changes [SIM]"
...
svn merge -r 128022:128028 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/server__merge__trunk-r127980 to svn+ssh://svn.lindenlab.com/svn/linden/trunk
This is the server-side merge for inventory links, folder links&types, and landmark&callingcard permissions.
2009-07-24 00:46:26 +00:00
a00af78b95
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
5f4c09fa1f
Python 2.4 and 2.6 improvements
...
The sets module is no longer needed with Python 2.4, and causes a
DeprecationWarning with 2.6, so drop it
The md5 module causes a DeprecationWarning with 2.6, so try to import
hashlib (its replacement) instead, else fall back
Reviewed by Poppy.
2009-06-22 22:36:36 +00:00
9a8d069902
svn merge -r118673:120720 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
...
Merging server-1.26 back to trunk.
Two conflicts -- llversionserver.hh (kept the trunk version)
and in llsimparcelmgr.cpp -- also kept the trunk version. There was
some code in 1.26 that included error
printing from RDW that says "we should
really not be hitting this code", and that
code was gone in trunk... so, went ahead
and kept the trunk part of that one
conflict in that file.
2009-05-19 17:16:44 +00:00
6df2755ba6
Result of svn merge -r119432:120464 svn+ssh://svn/svn/linden/branches/http_database/merge-03 into trunk. QAR-1462
2009-05-18 23:38:35 +00: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
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
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
1aca3ff6f5
Get 32-bit builds going on 64-bit Debian Etch.
...
Reviewed by Brad.
2009-04-09 18:05:56 +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
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
c88b470a8a
svn merge -r108815:112761 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
...
The biggest things in this are Scalable Space Servers and Maint-Server-6
QAR-1209 : SSS
QAR-1295 : maint-server-6
Conflicts resolved by prospero:
C scripts/farm_distribute
C scripts/automated_build_scripts/build-linux.sh : resolved by
prospero, mostly kept the merge-right version in
the conflict, but there was one block of repeated
code from earlier that I removed.
C scripts/automated_build_scripts/build-mac.sh : kept merge-right
C indra/llcommon/llversionserver.h : svn revert
C indra/newsim/llsimparcel.h : kept *both*... working had "setArea",
merge-right had exportStream and importStream
C indra/newsim/llsimparcel.cpp : see llsimparcel.h
C indra/newsim/lltask.h : working had LLTask derived also from
LLScriptResourceConsumer, merge-right had LLTask
dervied also from LLAgentPosition. To resolve
conflict, derive from both.
C indra/newsim/lllslmanager.h : kept merge-right (had an added comment)
C indra/llmessage/llhttpnode.h : kept working (added the definition
of method LLHTTPNode::extendedResult)
C indra/lscript/lscript_execute_mono/llscriptexecutemono.cpp
C indra/lscript/lscript_execute_mono/llscriptexecutemono.h
: These two were resolved by si, in consultation with daveh
I also had to add the following stubs to
indra/newsim/tests/llgodkickutils_test.cpp in order to get it to
compile:
// LLScriptResourceConsumer interface methods in LLTask
LLScriptResource::LLScriptResource() { }
LLScriptResourcePool::LLScriptResourcePool() { }
LLScriptResourcePool LLScriptResourcePool::null;
LLScriptResourceConsumer::LLScriptResourceConsumer() { }
LLScriptResourcePool& LLScriptResourceConsumer::getScriptResourcePool() { return LLScriptResourcePool::null; }
const LLScriptResourcePool& LLScriptResourceConsumer::getScriptResourcePool() const { return LLScriptResourcePool::null; }
bool LLScriptResourceConsumer::switchScriptResourcePools(LLScriptResourcePool& new_pool) { return false; }
bool LLScriptResourceConsumer::canUseScriptResourcePool(const LLScriptResourcePool& resource_pool) { return false; }
bool LLScriptResourceConsumer::isInPool(const LLScriptResourcePool& resource_pool) { return false; }
void LLScriptResourceConsumer::setScriptResourcePool(LLScriptResourcePool& pool) { }
S32 LLTask::getUsedPublicURLs() const { return 0; }
void LLTask::setScriptResourcePool(LLScriptResourcePool& pool) { }
2009-02-25 21:02:17 +00:00
c72df34847
Drop linux32 support from install.xml and install.py, since unused and untested
2009-02-24 21:24:36 +00:00
e3cf284388
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
c52e690933
make it easer for developers to examine list output by sorting the results prior to display. DEV-25457
2008-12-29 18:55:00 +00:00
189599b6ff
Merging from server/server-1.25 back to trunk.
...
svn merge -r99446:104838 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.25
Conflicts resolved by Prospero, except for one scary conflict in
SendConfirmationEmail.php which was resolved by jarv.
2008-12-04 22:36:34 +00:00
fd46865a50
QAR-1040 maint-viewer-11 + OpenAL combo mergeme
...
svn merge -c104451
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/openal-maint-viewer-11-combo-r104448
2008-12-02 20:35:40 +00:00
2a44e81675
QAR-1018 Lightweight Windows Setup App (windows-setup-3). svn merge -r102882:102883 svn+ssh://svn.lindenlab.com/svn/linden/branches/windows-setup/windows-setup-3-merge
2008-11-19 23:26:29 +00:00
27b749ead6
someone added a directory to a file list in one of the prepacked libs. just ignore that use error on cleanup.
2008-10-28 16:10:56 +00:00
5f3875018e
svn merge -r99056:99248 svn+ssh://svn.lindenlab.com/svn/linden/branches/andrew/gcc-4-003-for-merge
2008-10-10 16:04:02 +00:00
b807e3df99
merge r97380-98701 branches/viewer/viewer_1-21 (Viewer RC5 and security fixes) merge to trunk (for real)
2008-10-08 00:22:32 +00:00
4296542cd0
Roll back of r98854 Accidentally commited merge in progress
2008-10-07 22:49:00 +00:00
c9be97fdfc
merge r97380-98701 branches/viewer/viewer_1-21 (Viewer RC5 and security fixes) merge to trunk
2008-10-07 22:43:15 +00:00
095aca3eae
svn merge -r98039:98711 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-24-Server --> release
...
Merging various security fixes from Branch_1-24-Server.
Related to RequestXfer exploit:
* DEV-21706 (SEC-188): llParticleSystem can be used to obtain asset id.
* DEV-21767: Migrate RequestXfer to TCP-only
* DEV-21765: Fix RequestXfer traversal exploit
* DEV-21775: LLXferManager::processFileRequest() still has file vulnerabilities
Various fixes:
* fix for VFS memory corruption in llvfs.
* Bump server version to 1.24.9.
Landstore fixes:
* Passing locale to fulfill-order-item from region reservation fulfillment.
2008-10-07 20:50:30 +00:00
b59caea980
- install.xml updated with versions of tarfiles which no longer contain debug lib files on linux and darwin. Files mistakenly added previously from automatically generated linux build dir (viewer-linux-i686) removed. Also some dll's mistakenly added to linux lib tarfiles removed.
...
- file lists in assemblies/3rd_party_libs (used for updating lib tarfiles) updated as per above
- new config files created for 'glib' library; glib files removed from gtk-atk-pango-glib filelist. glib can be decoupled from mono, when appropriate.
- package.py help dialogue and error reporting updated for clarity.
- install.py will now output list of files installed for a package with command-line option
2008-08-19 23:21:06 +00:00
9a7d68cfce
svn merge -r93014:93396 svn+ssh://svn.lindenlab.com/svn/linden/branches/mono-r93014-qar633 dataserver-is-deprecated
2008-07-31 12:15:15 +00:00
e79f766f57
Tweak output of test_all_platforms.py
2008-07-25 20:21:32 +00:00
52562e2e66
svn merge -r92720:92721 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-merge
...
QAR-698 / DEV-9985 add touch "position" information to touch-events in LSL
2008-07-23 21:20:19 +00:00
35b4a91129
svn merge -r92710:92709 svn+ssh://svn.lindenlab.com/svn/linden/release --> release
...
Undo r92710 (for QAR-698) - went straight into release instead of a side branch for validation.
2008-07-22 20:55:02 +00:00
df4f20d4f5
merge uv-picking branch.
...
svn merge -r92602:92632 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-4
2008-07-22 20:12:37 +00:00
ed386ae547
merge support-featurettes-snapshot-merge-2 for QAR-754, includes:
...
* featurettes-4 89061:89589 (which is all of featurettes-1, -2, and -3, and part of -4)
* gteam-showstoppers-3 91950:91951 (which is all of gteam-showstoppers-1, -2, and -3)
* featurettes-5 92149:92150 (patch for last line of chat text not visible in chat history, DEV-17771)
* snapshot-3 91988:91991 (which is all of snapshot-1, -2, and -3)
Merging revisions 92190-92387 of svn+ssh://svn.lindenlab.com/svn/linden/branches/support-featurettes-snapshot-merge-2 into release, respecting ancestry
* QAR-590 Merge Lock Request for Support Sprint
* QAR-627 Merge snapshot improvements
* QAR-686 Merge Lock request for Featurettes
2008-07-18 17:50:25 +00:00
d32c8825b6
svn merge -r89701:90677 svn+ssh://svn/svn/linden/branches/install-dev-binaries/s3-build -> release
2008-06-26 19:08:51 +00:00
4642d22071
Make the output of install.py --list readable
2008-06-23 21:16:15 +00:00
dc3f5ff87c
svn merge -r90150:90340 svn+ssh://svn.lindenlab.com/svn/linden/branches/qar-699_combo-merge --> release
...
QAR-699 - Combo merge for QAR-687, QAR-637, QAR-586
* QAR-687 - Test build with libs on S3
* QAR-637 Test dynamic sound throttle
* QAR-586 Test new http features branch
2008-06-21 07:39:52 +00:00
fbf15572d9
svn merge -r89258:89534 svn+ssh://svn/svn/linden/branches/install-dev-binaries/idb2-merge-buildme
2008-06-12 20:51:41 +00:00
9db949eec3
svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge
...
dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers
2008-06-02 21:14:31 +00:00
a089a401ee
svn merge -r 84911:86069 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-21-Server --> release
...
Backport fixes made in the production branch to the trunk now that it is live on the grid:
* DEV-14443 Launcher not producing colo prefix when looking up sim class
* DEV-10840 "/etc/init.d/backbone stop" returns before all child backbones exited; "backbone restart" results in defunct children
* DEV-12558: Able to make anyone's object shout error messages
* QAR-483 user start location migration prelude
* QAR-490 havok4-6
* Revert havok4-5/4-6 code changes causing parcel access check issues
* Revert QAR-277 sqlite-backbone
* DEV-12357 SEC-53: Script that crashes regions
* QAR-486 New proc and query for Web Classifieds Fix
2008-04-28 19:40:54 +00:00
b73ad51784
svn merge -r84080:84255 svn+ssh://svn/svn/linden/branches/intermezzo-9
...
QAR-431
2008-04-08 21:04:41 +00:00
dc48f1c741
svn merge -r83872:83893 linden/branches/Branch_1-20-0-Server to linden/release
...
HAVOK4 IN TEH HOUSE!!11!!ONE!!
If it is broken blame Joel for not fixing the loginassetdatabaseinventorygroupIM server instead of working on this.
QAR-448
2008-04-03 22:50:22 +00:00
383f92e543
Simplify dir joining in setup-path
...
Make validate_schemas show best-guess for schema script, to help build engineers
2008-02-14 21:06:59 +00:00
98fd90ddd6
svn merge -r 79730:79944 svn+ssh://svn.lindenlab.com/svn/linden/branches/parcel_media/sl-parcelmedia-6 --> release
...
QAR-275 Parcel Media
Sam made me do it.
2008-02-14 01:45:59 +00:00
4b39451ff1
$ svn merge -c79668 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-3
...
merge in the fix for template_verifier which avoids multiple
concurrent builds from stomping on each other.
2008-02-11 23:32:18 +00:00
9cb55b05c2
Handle SVN not being set as an environment variable.
2008-01-15 20:51:39 +00:00
159d2d471f
Make update_version_files.py look in the environment for the location of
...
the svn executable, default to "svn" is not set.
2008-01-15 19:25:06 +00:00
e4b451015e
Added workaround for popen bug in scripts/update_version_files.py
...
when executable is in a weird location...
2008-01-15 18:26:59 +00:00
7dd08303a3
svn merge -r 75354:76103 svn+ssh://svn.lindenlab.com/svn/linden/branches/voice-group-moderation-3 -> release. Finished product of QAR-134
2007-12-19 00:56:59 +00:00
9754d265eb
EFFECTIVE MERGE: svn merge -r 73781:75018 svn+ssh://svn/svn/linden/branches/FixGroupVotes into release
...
ACTUAL MERGE: svn merge -r 75163:75166 svn+ssh://svn/svn/linden/qa/FixGroupVotes-merge-75160 into release
2007-12-06 18:18:35 +00:00
e5057b4747
svn merge -r 73201:74169 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-5-Server --> release
2007-11-21 02:29:23 +00:00
78aec043f3
svn merge -r 73148:74186 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-5-Viewer --> release
2007-11-21 02:10:12 +00:00
138bf17c3c
merge of age verification changes from QAR-76 to release; changes were originally made on the age_verification_2007xxxx branches; final changes were QA'd on age_verification_20071112.
2007-11-15 19:10:29 +00:00
1e7917fa89
Committing viewer-auth-server into release svn merge -r72818:72835 svn+ssh://svn/svn/linden/branches/viewer-auth-server-2
2007-11-02 21:26:41 +00:00
5595a99623
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
7ba0214179
export source now detects the prefix rather than assigning it based on filename. fixed up some comments to match our coding standard. added ability to set default license on export which will be useful for the next source drop. SL-56607
2007-10-02 23:42:54 +00:00
6981b3bc36
svn merge -r 69806:70964 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-3-Server --> release
...
Merge fixes applied directly to 1.18.3 for server deploy, through the sim rollout:
* Listen on the right port for the auditor, don't rely on catch-all
* Fix XMLRPC test object channel
* Various VAT fixes
* Make update_version_files more resilient
* Add class 502/510 for new datacenter
* Teleport metrics fixes
* DB schema update
2007-10-02 22:43:34 +00:00
5fa5307595
Run even if server version files are not present (e.g. if we share this outside LL with a viewer source drop). Also a little bit of variable renaming to clarify what's going on, and more verbosity when requested.
2007-09-26 17:56:33 +00:00
07c24d0437
Passed QA, merging minifriends-3:70006 back to release
2007-09-19 21:28:44 +00:00
b2595c369f
Merge sl-search-opt-in back into the release branch
...
Reviewed by Josh and Don
2007-08-30 22:11:52 +00:00
ce0a5fe145
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
...
Actual action: branched maintenance-r68118, merged in release, then copied result into release
2007-08-21 22:17:53 +00:00
3b2515fd5f
merge -r 66233:67472 svn+ssh://svn/svn/linden/branches/het-grid-4 Paired by Tess and Leyla.
...
Added tests to version manager and fixed failed tests. Paired by rdw and Tess.
2007-08-10 02:15:37 +00:00
7769191414
Added much more error-recovery logic to template-verifier -- e.g. it retries a few times to fetch the master from the web. Also I changed the master to live in the system global tempdir, mostly because the build machines had a network problem and I wanted to reduce the chance of that happening. Not reviewed, but I'm checking it in over the weekend so I can silently fix it if there's yet another weird configuration difference that breaks it on the build machines.
2007-07-22 06:29:36 +00:00
dd6a0467ed
Fix parabuild breakage. Why the F is urllib opening an ftp connection to localhost? Not reviewed.
2007-07-20 22:10:59 +00:00
987d14fd46
SL-49406: template_verifier.py requires network access to build. Implemented a 4-hour cache so it hits the network less often overall (saving approx .5 seconds every build), and added fault tolerance for when it fails to fetch the master over the network. It'll whine at you if it can't fetch it, but even if it can't get the master from the network and doesn't have a cached copy at all, it will still at least do a syntax check on the local template.
2007-07-20 21:49:31 +00:00
168794a0f3
Replaced usage of urlopen.read(), which isn't guaranteed to return all of the downloaded bytes, with urlopen.readlines(), which (I believe) does have that guarantee. This should fix the rash of mysteriously-failing prebuilds. In the process, added some better error messaging about whether the local template has the parse error, or the master on the network. Also some reorganization. Reviewed by Tess and Leyla.
2007-07-19 01:09:12 +00:00
7964c6f7a5
Result of svn merge -r65183:65337 svn+ssh://svn/svn/linden/branches/python-shuffle into release. Also includes untabification of many python files.
2007-07-16 20:29:28 +00:00
57b8fef824
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
029130bf9c
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
4ecb9cb63e
svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate into release
2007-05-01 21:39:25 +00:00
25f95cd08f
SL-38184 Make python scripts in linden/scripts run in place without PYTHONPATH or symlinks. Reviewed with Donovan.
2007-03-22 20:29:41 +00:00
934e15973e
merge release@57486 release-candidate@57503
2007-01-31 19:36:32 +00:00
71d28bdbf0
merge release@56803 release-candidate@56833
2007-01-17 23:02:00 +00:00
420b91db29
Print done when done.
2007-01-02 08:33:20 +00:00
Tank_Master