7394730eaa
Merge up to LL FUI
2011-10-28 02:00:09 -04:00
7e5be23686
add proper license headers to files that did not have them
2011-08-17 14:43:39 -04:00
f0bc8a0f71
convert tabs to spaces where they are forbidden
2011-08-17 12:33:23 -04:00
afe5c530b9
Use ".in" files for source files that contain build-specific data.
2011-08-08 07:41:56 -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
a2e86bf04a
Windows packaging workaround
2011-05-10 15:12:20 -04:00
b04a325088
fix for FIRE-867 (VC express on 64bit OS patch)
2011-04-13 10:44:03 -07:00
10e88f3891
Merge with RLVa-LL2.5.2
2011-04-09 22:24:22 -07: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
f96328b8e2
Fixing build with the manifest mython script.
2011-01-27 14:47:15 -08:00
be934f3c7b
Changing version numbers to be done in a cpp file rather than a h file.
2011-01-25 16:25:56 -08:00
061c3a5ab6
VWR-20879: Allow find_vc_dir() to work with VCExpress
2010-12-27 12:18:19 +00:00
3070ce747f
Manually importing WolfSpirit's 2008 patch to firestorm lgpl, because we don't merge from gpl to lgpl.
2010-11-19 14:31:03 -05:00
348d15f836
Phoenix branding, part 1, macintosh build
2010-10-19 23:31:37 -04:00
a4b223248e
Merge
2010-09-27 17:54:52 -07: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
a36033853a
STORM-168 : Python modules cleanup
2010-09-16 14:27:42 -07:00
fcb240792f
VWR-20747 (SNOW-527) FIXED Don't import deprecated python module sets
2010-08-18 11:58:24 +01:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
fedb5a25a2
correct license tags from "internal" to "viewergpl"
2010-08-12 20:30:21 -04:00
d34d8e491b
Make run_command() use subprocess.Popen() rather than os.popen().
...
This lets us capture the command's stderr as well as stdout. I've been
perplexed recently by errors from Mac SetFile commands that didn't report
stderr.
2010-06-18 17:43:30 -04:00
cbc0674a7a
EXT-4163 Don't strip viewer symbols, or tar the result, in DEBUG builds
2010-01-11 14:35:39 -08:00
9e69702fe7
Added calls to ll_deploy_sharedlibs_command
...
Using viewer_manifest.py for windows dependency deployment during build.
Added SHARED_LIBS_REL_PATH var to cmake cache.
2009-11-05 08:52:07 -08:00
0d0840de0e
Routing mt.exe output to NUL to hopefully fix expected error build failures...
2009-10-01 14:51:35 -07:00
292aecbb3e
Updated test_win32_manifest.py to throw custom exception objects, rather than relying on string comparison.
2009-09-30 18:57:00 -07:00
17f9fd5f96
Changes force no crt manifest linking in windows plugin files.
2009-09-25 19:23:24 -07:00
afb053ebd7
Minor tweaks of test_win32_manifest output.
2009-09-18 19:30:10 -04:00
bb1d4592bd
Merged latest viewer/viewer-20 into login-api.
2009-09-18 15:22:25 -04:00
93869a8ef2
Fixed up CopyWinLibs.cmake post moap/viewer-2.0.0-3 merge.
...
Added CRT assembly check to viewer_manifest.py.
twiddled test_win32_manifest.py for ease of use.
2009-09-15 12:32:22 -07:00
11d10bd53a
merged cg's automated build script changes into login-api
2009-09-08 16:44:38 -04:00
7ad3af45a6
Merge
2009-09-08 13:27:05 -07:00
dd628f29af
Use rev numbers instead of changeset IDs for now.
2009-09-01 11:54:34 -07:00
5f3a7fa6f3
Patch in some other useful scripts from trunk.
2009-09-01 11:18:33 -07:00
ff11d74820
Add Mercurial-specific build version info.
...
Pilfered from billc.
2009-08-26 10:57:38 -07:00
e588d1f284
svn merge -r125825:125901 svn+ssh://svn.lindenlab.com/svn/user/cg/qar-1654
...
QAR-1654 merge completed.
2009-07-01 00:22:05 +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
99660542bb
Adding back the setting of "DEBUG", the lack of which caused many unit
...
tests to fail.
2009-05-19 15:19:39 +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
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
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
15a6d273cc
svn merge -r108142:108148 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/maint-server-5-r108113
2009-01-17 01:29:45 +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
fb793870fe
QAR-1142 merging 1.22 RC0-RC4 changes.
...
svn merge -c 106471 svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_1-22-106055_merge
2008-12-23 19:39:58 +00:00
14a5879c88
svn merge -r104949:105037 svn+ssh://svn.lindenlab.com/svn/linden/branches/rad-chilies/rad-chilies-06-release-merge
...
QAR-1048: Distributed L$ Transactions > Rad Chilies 06 Indra items
2008-12-09 22:41:28 +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
a86aa7d8b0
QAR-963 svn merge -r101685:101752 svn+ssh://svn.lindenlab.com/svn/linden/branches/rad-chilies/rc05-release-merge
2008-11-18 21:20:05 +00:00
b2bfb128e7
Merged into release with command:
...
=================================
svn merge -r100865:101402 svn+ssh://svn/svn/linden/branches/purge-dpo-code-for-merge .
QAR-951 : Sandbox QA for DEV 20842 - Ensure DPO is not enabled accidentally
QAR-967 : Merge Build for DEV 20842 - Ensure DPOis not enabled accidentally
QA tested: Beast, Oskar
DEV's fulfilled as part of this branch:
======================================
DEV-20842 Prevent accidental activation of DPO procs
DEV-23028 Mac build fails - link error dual inclusion
DEV-20824 VWR-9255: Build fails on mac_updater and mac_crash_logger targets due to info.plist problems
DEV-22997 Xcode project: 'server' target has no dependencies
DEV-23353 Friend request custom messages come through as an asset tag.
DEV-23309 Voice Chat Indicator does not show active voice status
DEV-23187 Can't teleport to home location
2008-11-07 00:07:44 +00:00
091962408e
* Added del_empty_estates.py script.
...
* Shifted common code for copy_bans.py and del_empty_estates.py into the indra library.
* Documented copy_bans.py and del_empty_estates.py.
* Added iter_chunks generator to a new module: indra.util.iterators.
* Added unit tests for indra.util.iterators.
2008-11-04 16:57:17 +00:00
Arrehn