23336feed2
tag merge of DRTVWR-286
2013-01-18 12:51:16 -05:00
7ecfa28c43
MAINT-2247 Child object does not update rotation while selected.
2013-01-16 15:21:11 -08:00
c842494b77
Added tag 3.4.5-beta2 for changeset 6b9c7dbebef7
2013-01-14 10:43:57 -05:00
2e4e3c91bb
merge changes for DRTVWR-283
2013-01-14 09:50:14 -05:00
33d7784890
tag merge of DRTVWR-283
2013-01-14 09:50:09 -05:00
9f21775788
merge changes for DRTVWR-281
2013-01-11 18:42:56 -05:00
a9a4483df2
tag merge of DRTVWR-281
2013-01-11 18:39:25 -05:00
90fb925d84
fix line endings
2013-01-11 15:23:18 -08:00
627e531d33
MAINT-417 Backed out changeset: 7273a1ac51e8
2013-01-11 17:17:13 -06:00
33734be9f3
Added tag 3.4.5-beta1 for changeset 40a2265058ab
2013-01-10 21:04:33 -05:00
fca9b86733
merge changes for DRTVWR-280
2013-01-10 16:56:06 -05:00
c36d3ea291
tag merge of DRTVWR-280
2013-01-10 16:56:02 -05:00
f3b362a6d4
merge changes for DRTVWR-279
2013-01-10 14:42:41 -05:00
bc522d6ba2
tag merge of DRTVWR-279
2013-01-10 14:42:36 -05:00
9c94cf4e59
pull back release tag for 3.4.4
2013-01-10 14:35:21 -05:00
4cbef6d928
MAINT-2209 Parcel name not updating after teleport
2013-01-10 09:46:41 -08:00
c4a1bd1c2f
viewer-development merge
2013-01-09 15:25:06 -08:00
b0c449d301
[MAINT-2185] Unable to upload terrain .raw files
...
- Fixed an issue where a slash was prepended to the beginning of the filename (which happened to be the full path)
2013-01-09 15:24:27 -08:00
d16757545c
Added tag 3.4.4-release for changeset e1bb1ae7d8b1
2013-01-09 18:19:24 -05:00
cdd45b9abb
merge changes for DRTVWR-276
2013-01-09 15:18:20 -05:00
42a33b6c62
tag merge of DRTVWR-276
2013-01-09 15:18:10 -05:00
4a84c7c8e5
More merge cleanup.
2013-01-09 13:20:41 -06:00
971e9bd203
More merge cleanup.
2013-01-09 12:41:57 -06:00
dda41e3458
Merge cleanup.
2013-01-09 12:08:31 -06:00
bf55755262
merge changes for DRTVWR-277
2013-01-08 14:41:49 -05:00
954ebaed84
Automated merge with https://bitbucket.org/lindenlab/viewer-tiger
2013-01-08 13:40:59 -06:00
78f63524ab
tag merge of DRTVWR-277
2013-01-08 14:29:25 -05:00
b601bc3cbf
remove duplicated return (merge artifact)
2013-01-08 11:24:33 -05:00
a7dbaaa0af
merge changes for DRTVWR-250
2013-01-08 09:45:27 -05:00
77abdd04a4
tag merge of DRTVWR-250
2013-01-08 09:34:12 -05:00
b0d3975818
FIX INTL-110 remove utf8 BOM
2013-01-07 17:10:37 -08:00
1f4f028044
FIX INTL-110 fix corrupted chinese character in translation
2013-01-07 17:06:28 -08:00
8c654704d4
merge with head
2013-01-07 13:08:40 -08:00
0d12d171cf
pull back 3.4.4-beta4 tag
2013-01-04 14:15:08 -05:00
fde976cf2b
Added tag 3.4.4-beta4 for changeset 05d9f1dd7a95
2013-01-04 14:09:03 -05:00
02d9734c45
merge back DRTVWR-275 from 3.4.4 beta
2013-01-04 10:12:04 -05:00
def472b45c
tag merge of DRTVWR-275
2013-01-03 18:12:29 -05:00
2cba564b24
MAINT-2184 [crashhunters] new crash in LLUUID::toString
...
Fix dangling references.
2013-01-03 09:17:25 -08:00
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
Oz Linden