cd1871d2e3
merge changes for DRTVWR-269
2013-01-02 10:15:33 -05:00
55dfff68d4
tag merge of DRTVWR-269
2013-01-02 10:15:28 -05:00
8c8d5ef924
merge changes for DRTVWR-272
2012-12-28 09:43:55 -05:00
332eec9b70
tag merge of DRTVWR-272
2012-12-28 09:43:51 -05:00
45492b81a0
merge changes for new Havok license
2012-12-27 13:45:17 -05:00
835660bbb2
merge changes for DRTVWR-273
2012-12-25 09:00:49 -05:00
4364924ee4
tag merge of DRTVWR-273
2012-12-25 09:00:42 -05:00
b003ed1fd7
merge accidental commit and its fix
2012-12-21 11:28:16 -05:00
36f094d508
MAINT-2168: Backed out changeset fb93eecd462d, reapply fix
...
Now that we've backed out the premature push, reapply the actual fix to
propagate it appropriately.
2012-12-21 09:03:06 -05:00
144fcf62fb
MAINT-2168: Backed out changeset 797318b62275, pushed to wrong repo
...
This changeset was prematurely pushed to the wrong repository. Back it out
to propagate it the right way.
2012-12-21 09:01:09 -05:00
747784a9b1
MAINT-2168: fail with real message if required var PORT not set.
...
llhttpclient_test.cpp is only supposed to be run by test_llsdmessage_peer.py,
as specified in llmessage/CMakeLists.txt. test_llsdmessage_peer.py sets the
environment variable PORT before running INTEGRATION_TEST_llhttpclient. While
it's not yet clear under what circumstances INTEGRATION_TEST_llhttpclient
could find PORT not set (getenv() returning NULL), it's obvious that in that
case, the previous code might well crash. Make it at least fail with an
explanatory message rather than a mysterious large negative integer. In
theory, occurrences of that message could help us solve the underlying issue.
2012-12-21 08:52:39 -05:00
b6acda245c
merge changes for 3.4.4-beta3
2012-12-20 16:28:24 -05:00
0baf43730b
Added tag 3.4.4-beta3 for changeset 2f8a3ef687bc
2012-12-20 15:34:18 -05:00
e1497b1b39
merge changes for DRTVWR-271
2012-12-20 14:50:48 -05:00
a53323f328
tag merge of DRTVWR-271
2012-12-20 14:50:42 -05:00
e3fa3addd0
Reverted mac updater
2012-12-20 10:51:55 -08:00
867d00c687
There goes a month of work
2012-12-20 09:16:16 -08:00
ab23506eb1
merge changes for 3.4.4-beta2
2012-12-19 17:50:41 -05:00
d8ac1c0f2f
Added tag 3.4.4-beta2 for changeset cd39255bd233
2012-12-19 17:49:16 -05:00
173213b986
merge changes for DRTVWR-270
2012-12-19 16:52:35 -05:00
213be712b2
tag merge of DRTVWR-270
2012-12-19 16:52:25 -05:00
1c7f19c865
change to use lindenlab repo for havok source, with new license
2012-12-19 09:45:28 -05:00
0ed83541bf
upgrade boost build to use public build of icu4c
2012-12-19 09:41:59 -05:00
c2e272577a
Automated merge with ssh://bitbucket.org/lindenlab/viewer-development
2012-12-19 08:10:50 -05:00
64e3352aa1
MAINT-1986: merge in TeamCity check in hashmap_test
2012-12-19 06:42:50 -05:00
205f77e035
MAINT-1986: merge in server-trunk fixes
2012-12-19 06:42:04 -05:00
8a2c30b388
MAINT-1986: in TeamCity, do not reload saved hashmap_test data.
...
Rev b7fd7c95c571 allows a developer to debug a failure in hashmap_test 1. Once
the test fails, rerunning that test will replay the same failure to try to
permit debugging it. But that behavior is extremely undesirable under
TeamCity! In a TeamCity run, don't even check for saved data file.
2012-12-19 06:40:44 -05:00
a9a21ecffa
Switched mkTempDir back to using apple standard tempdir behavior instead of /tmp
2012-12-18 13:30:21 -08:00
5c334bdc5b
MAINT-1986: patch OPSDEV-111 fix (rev 9346b73d6843) from server-trunk
2012-12-18 16:09:31 -05:00
f08c5d95ac
MAINT-1986: patch DEV-50942 fix (rev 28828ba0f0be) from server-trunk.
2012-12-18 14:20:06 -05:00
00d6b19134
tag merge of DRTVWR-268
2012-12-18 10:32:19 -05:00
3974d1eb9d
Pull and merge from https://bitbucket.org/lindenlab/viewer-development .
2012-12-17 14:06:20 -08:00
2e015caf26
Pull and merge from https://bitbucket.org/lindenlab/viewer-development .
2012-12-17 13:31:47 -08:00
6710b60b10
MAINT-2134: Removing llassert() calls that were causing problems with the Debug and RelWithDebInfo builds. Also, reworked the rest of the methods to only apply in cases where the class instance has been initialized.
2012-12-17 13:17:00 -08:00
1be900c153
increment version to 3.4.5
2012-12-17 14:54:12 -05:00
769336a72e
Added tag 3.4.4-beta1 for changeset 083d2d36b5bb
2012-12-17 14:46:39 -05:00
d403499759
pull back 3.4.3-release tag
2012-12-17 14:46:27 -05:00
2206653f2e
Added tag 3.4.3-release for changeset 0a2ca6546b49
2012-12-17 14:44:26 -05:00
36222cfa8c
merge changes for DRTVWR-244
2012-12-17 10:15:01 -05:00
7a6b073dca
tag merge of DRTVWR-244
2012-12-17 10:14:32 -05:00
b6abf5c0ee
Merged
2012-12-16 17:48:32 -08:00
c1db961ab9
Fixed small one-time memory leaks.
2012-12-16 17:45:55 -08:00
5c9dd94e19
BOOL vs bool FIGHT
2012-12-14 21:41:02 +00:00
07dd6cf67e
merge changes for DRTVWR-224
2012-12-14 12:57:05 -05:00
d3293be2fe
tag merge of DRTVWR-224
2012-12-14 12:56:58 -05:00
3a72577f39
Fixes from Oz's merge.
2012-12-13 18:27:32 -08:00
83299b56c4
merge fixes from 3.4.3-beta3
2012-12-13 18:18:39 -05:00
9f1b484817
Added tag 3.4.3-beta3 for changeset 870e2d79e006
2012-12-13 18:10:21 -05:00
d0eff20718
merge changes for DRTVWR-267
2012-12-13 17:12:34 -05:00
b7ac7a0797
tag merge of DRTVWR-267
2012-12-13 17:12:31 -05:00
Oz Linden