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
Tonya Souther