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
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
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
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
Dave Parks