Oz Linden
|
b53481354d
|
tag merge of DRTVWR-190
|
2012-08-10 08:08:25 -07:00 |
|
Dave Parks
|
e3c5cf99f1
|
MAINT-1270 Fix for some flexi prims becoming flat at some LoDs
|
2012-07-16 17:27:52 -05:00 |
|
Oz Linden
|
509408f393
|
merge back beta fixes for DRTVWR-180
|
2012-07-14 09:30:09 -04:00 |
|
Oz Linden
|
a4df79bcdc
|
tag merge of DRTVWR-180
|
2012-07-14 08:50:13 -04:00 |
|
Oz Linden
|
c3d9f0e41c
|
merge changes for DRTVWR-179
|
2012-07-13 13:04:16 -04:00 |
|
Oz Linden
|
e51a60536d
|
tag merge of DRTVWR-179
|
2012-07-13 13:03:50 -04:00 |
|
Dave Parks
|
f5254d532b
|
MAINT-1262 Fix for crash when setting graphics to Low
|
2012-07-12 16:53:31 -05:00 |
|
simon@Simon-PC.lindenlab.com
|
56d563ba7f
|
Fix merge issues - duplicate insertions of code
|
2012-07-11 17:14:25 -07:00 |
|
simon@Simon-PC.lindenlab.com
|
173d0fa213
|
Pull in viewer-development because it's painful. Merge with runitai's help.
|
2012-07-11 16:15:23 -07:00 |
|
Dave Parks
|
997b360747
|
MAINT-794 Fix for assert on loading some types of objects before their parents.
|
2012-07-11 15:17:13 -05:00 |
|
Oz Linden
|
254c270363
|
merge changes for DRTVWR-175
|
2012-07-09 16:16:12 -04:00 |
|
Oz Linden
|
2a34148e20
|
tag merge of DRTVWR-175
|
2012-07-09 16:14:35 -04:00 |
|
Oz Linden
|
06bb4a832a
|
correct dos line endings
|
2012-07-09 16:14:00 -04:00 |
|
Oz Linden
|
5a563069e8
|
merge back more late beta fixes from 3.3.4
|
2012-07-09 12:45:22 -04:00 |
|
Oz Linden
|
f7f27e4f26
|
Added tag 3.3.4-beta3 for changeset a8057e1b9a12
|
2012-07-09 12:42:16 -04:00 |
|
Oz Linden
|
690f985a9c
|
merge changes for DRTVWR-177
|
2012-07-09 11:41:47 -04:00 |
|
Oz Linden
|
1b109f80b9
|
tag merge of DRTVWR-177
|
2012-07-09 11:41:22 -04:00 |
|
Oz Linden
|
9298b1abe9
|
merge changes for DRTVWR-176
|
2012-07-08 18:36:15 -04:00 |
|
Oz Linden
|
ed21e67a38
|
merge changes for DRTVWR-176
|
2012-07-08 17:21:06 -04:00 |
|
Oz Linden
|
13f7afbd7d
|
merge changes for DRTVWR-176
|
2012-07-08 16:39:54 -04:00 |
|
Oz Linden
|
02bb54273f
|
tag merge of DRTVWR-176
|
2012-07-08 16:39:03 -04:00 |
|
callum
|
51f740ca8d
|
MAINT-1228 FIX Can not put more than one object into the contents of an object
Reviewed by Paul PE
|
2012-07-06 11:31:37 -07:00 |
|
eli
|
f0fd5525d7
|
FIX INTL-99 set32 translation for 8 languages
|
2012-07-03 12:38:47 -07:00 |
|
Oz Linden
|
ed5b46c9b0
|
merge back changes from 3.3.4-beta2
|
2012-07-02 12:38:07 -04:00 |
|
Oz Linden
|
9b1208e495
|
disable alignment tests in debug builds (where they fail)
|
2012-07-02 10:18:38 -04:00 |
|
Oz Linden
|
077e851bdd
|
Added tag 3.3.4-beta2 for changeset 82b5330bc8b1
|
2012-06-30 06:12:06 -04:00 |
|
simon@Simon-PC.lindenlab.com
|
08c6c5b78d
|
Added test back in, skip() call need to be removed.
|
2012-06-29 14:30:44 -07:00 |
|
Oz Linden
|
0fff60b3c9
|
merge changes for DRTVWR-174
|
2012-06-29 16:24:16 -04:00 |
|
Oz Linden
|
a49a47def6
|
tag merge of DRTVWR-174
|
2012-06-29 16:24:04 -04:00 |
|
Oz Linden
|
595b49b938
|
merge changes for DRTVWR-173
|
2012-06-29 16:15:24 -04:00 |
|
Oz Linden
|
a6b5b4322c
|
tag merge of DRTVWR-173
|
2012-06-29 16:15:11 -04:00 |
|
callum
|
11686a0917
|
Merge with viewer-beta
|
2012-06-29 10:36:04 -07:00 |
|
Oz Linden
|
326634e1bf
|
Added tag 3.3.4-beta1 for changeset f91d003091a6
|
2012-06-28 15:41:09 -04:00 |
|
Dave Parks
|
db5d1b851a
|
merge
|
2012-06-28 13:50:35 -05:00 |
|
Dave Parks
|
ed72fd0ae9
|
merge
|
2012-06-28 13:22:04 -05:00 |
|
Dave Parks
|
7f38f620fd
|
MAINT-1204 Fix for crash on selecting a texture anywhere other than the build tools.
|
2012-06-27 17:16:59 -05:00 |
|
Kelly Washington
|
a68c7c27f9
|
Merge pulled in lindenlab/viewer-beta to kelly_linden/maint-1078
|
2012-06-27 14:43:10 -07:00 |
|
Dave Parks
|
1d8f117069
|
Fix for linux build (skip llhttpclient unit tests that post to google.com)
|
2012-06-27 14:45:50 -05:00 |
|
Kelly Washington
|
14ebeffe87
|
MAINT-1078 Merchant Outbox import failures
Add 1s throttle on update checks for importer
reviewed with Simon
|
2012-06-27 11:32:54 -07:00 |
|
Oz Linden
|
2c3e78f1f1
|
merge changes for DRTVWR-167
|
2012-06-27 14:18:22 -04:00 |
|
Oz Linden
|
c9f1b1b511
|
tag merge of DRTVWR-167
|
2012-06-27 14:15:40 -04:00 |
|
Brad Payne (Vir Linden)
|
9481434bf9
|
line endings fix
|
2012-06-26 11:41:22 -04:00 |
|
Oz Linden
|
eb03da6e99
|
merge back packaging fix for linux hunspell library'
|
2012-06-25 22:58:27 -04:00 |
|
Oz Linden
|
8a7fa77f23
|
correct linux packaging for hunspell library
|
2012-06-25 22:56:58 -04:00 |
|
Oz Linden
|
cce8cd7341
|
increment version to 3.3.5
|
2012-06-25 16:58:53 -04:00 |
|
Oz Linden
|
9bf7e40e93
|
Added tag 3.3.4-beta1, DRTVWR-158 for changeset f87bfbe0b62d
|
2012-06-25 16:55:15 -04:00 |
|
eli
|
855eeec9ef
|
sync with viewer-release
|
2012-06-25 12:26:02 -07:00 |
|
Oz Linden
|
eacaf1c0cc
|
tag merge of DRTVWR-170
|
2012-06-25 14:29:44 -04:00 |
|
Dave Parks
|
667e5d1968
|
Merge cleanup
|
2012-06-22 14:59:40 -05:00 |
|
Brad Payne (Vir Linden)
|
89ee86c86c
|
line endings fix
|
2012-06-22 15:54:53 -04:00 |