Oz Linden
|
f8a2b67649
|
merge changes for storm-1060
|
2011-08-08 23:23:58 -04:00 |
|
Oz Linden
|
881a215535
|
more idiosyncracies for beta channel
|
2011-08-08 23:23:34 -04:00 |
|
Oz Linden
|
1d0575bcc4
|
merge beta fix for storm-1060
|
2011-08-08 16:52:08 -04:00 |
|
Oz Linden
|
f7e5282bad
|
fix idiosyncratic name for beta viewer channel icon recognition
|
2011-08-08 16:49:06 -04:00 |
|
Oz Linden
|
8053f7a5b0
|
correct xml syntax error
|
2011-08-08 11:08:33 -04:00 |
|
Oz Linden
|
7c7038136e
|
correct version number typo
|
2011-08-08 10:58:52 -04:00 |
|
Oz Linden
|
f30680cce9
|
correct merge-induced error in settings.xml
|
2011-08-08 10:56:32 -04:00 |
|
Oz Linden
|
09dc3fd81b
|
merge back beta tags
|
2011-08-08 10:08:22 -04:00 |
|
Oz Linden
|
33fa30f526
|
merge back release tag
|
2011-08-08 10:06:12 -04:00 |
|
Oz Linden
|
fb2733942c
|
increment viewer version to 3.0.0
|
2011-08-08 09:16:01 -04:00 |
|
Oz Linden
|
0d085e90ac
|
merge changes for storm-1060
|
2011-08-08 09:14:36 -04:00 |
|
Debi King (Dessie)
|
8c5da0552d
|
merged .hgtags
|
2011-08-05 19:09:28 -04:00 |
|
Debi King (Dessie)
|
8675901fa8
|
Added tag DRTVWR-75_2.8.3-beta1, 2.8.3-beta1 for changeset 599677276b22
|
2011-08-05 19:07:06 -04:00 |
|
Oz Linden
|
d456006f9a
|
remove override for channel testing
|
2011-08-05 16:23:31 -04:00 |
|
Oz Linden
|
38e18cd69c
|
undo Mac app name change (again)
|
2011-08-05 13:28:29 -04:00 |
|
Vadim ProductEngine
|
24f88cfe19
|
Merging STORM-565
|
2011-08-05 19:30:12 +03:00 |
|
Oz Linden
|
a3a7861874
|
undo Mac app name change
|
2011-08-05 11:59:57 -04:00 |
|
Oz Linden
|
0c2e949c6c
|
change parameters to test build for release
|
2011-08-05 10:18:02 -04:00 |
|
Oz Linden
|
e3114a8695
|
remove parameter used in test builds
|
2011-08-04 19:31:50 -04:00 |
|
Oz Linden
|
812ad1b679
|
merge changes for SH-2218
|
2011-08-04 18:58:21 -04:00 |
|
Oz Linden
|
7740691bf9
|
merge changes for SH-2218
|
2011-08-04 18:57:19 -04:00 |
|
Debi King (Dessie)
|
6c61a53791
|
Added tag DRTVWR-72_2.8.1-release, 2.8.1-release for changeset 29e93d7e1999
|
2011-08-04 17:28:43 -04:00 |
|
Oz Linden
|
aeb1f944aa
|
storm-1060 : add windows (thanks Kadah and Michelle), remove some files I think are no longer used
|
2011-08-04 16:52:19 -04:00 |
|
Oz Linden
|
f42df4cd9f
|
merge changes for storm-1538
|
2011-08-04 15:39:33 -04:00 |
|
Oz Linden
|
94c171d89b
|
merge changes for storm-1355
|
2011-08-04 15:37:31 -04:00 |
|
Oz Linden
|
4ba18501ea
|
merge changes for storm-1458
|
2011-08-04 15:36:26 -04:00 |
|
Oz Linden
|
57fec33490
|
merge changes for storm-1291
|
2011-08-04 15:30:11 -04:00 |
|
Oz Linden
|
5aa1521625
|
fix path choice for project branches, attempt to fix linux icon
|
2011-08-04 11:52:32 -04:00 |
|
Oz Linden
|
1b46240ed8
|
correct default channel
|
2011-08-04 11:14:18 -04:00 |
|
Oz Linden
|
7714f05e62
|
merge back disabling of watchdog
|
2011-08-04 11:13:30 -04:00 |
|
Oz Linden
|
9963e9aaac
|
fix license headers
|
2011-08-04 11:00:53 -04:00 |
|
Oz Linden
|
3369ebc8dd
|
fix DOS line endings
|
2011-08-04 10:57:03 -04:00 |
|
Oz Linden
|
ca3cea390c
|
merge changes for storm-1537 : releasable mesh branch
|
2011-08-04 09:12:08 -04:00 |
|
Oz Linden
|
2fcf7bc6d7
|
storm-1060 (temporary) adjust build params for icon selection test
|
2011-08-04 09:01:36 -04:00 |
|
Oz Linden
|
4877bb536e
|
storm-1060 (partial) : update icon selection for Mac and Linux builds
|
2011-08-04 08:52:32 -04:00 |
|
Leslie Linden
|
017a23aaf4
|
SH-2218 WORK AROUND -- v2.8.x Viewers crash consistently when I actively use other applications
* Just removed mac memory stats to make a low-risk work-around.
|
2011-08-03 17:07:49 -07:00 |
|
Oz Linden
|
299e18e588
|
Automated merge with file:///Users/oz/Work/V-PR
|
2011-08-03 14:13:12 -04:00 |
|
Oz Linden
|
1d9fe077a6
|
re-re-re-enable watchdog
|
2011-08-02 19:40:44 -04:00 |
|
Oz Linden
|
63fe879065
|
merge back late beta fixes
|
2011-08-02 19:39:44 -04:00 |
|
Oz Linden
|
f2193ce7e0
|
merge back late release fix
|
2011-08-02 19:39:27 -04:00 |
|
Oz Linden
|
93099e2289
|
merge changes for storm-1535
|
2011-08-02 19:24:11 -04:00 |
|
Oz Linden
|
01ee25cca4
|
disable watchdog
|
2011-08-02 19:16:56 -04:00 |
|
Merov Linden
|
0b81c19cbe
|
Pull from richard/viewer-experience
|
2011-08-02 15:07:35 -07:00 |
|
Nyx (Neal Orman)
|
5451af6cca
|
SH-2202 FIX physics costs have increased
Changed the default to use low LOD for single hull generation, will fall back to medium or high if not present.
|
2011-08-02 18:04:58 -04:00 |
|
Merov Linden
|
8d081d34fc
|
Sync with lindenlab/viewer-development
|
2011-08-02 14:41:28 -07:00 |
|
Nyx (Neal Orman)
|
c7b2a88875
|
pulling latest viewer-development into mesh merge branch.
|
2011-08-02 17:19:09 -04:00 |
|
Merov Linden
|
6d9158dcad
|
Attempt to fix Linux build failure
|
2011-08-02 13:31:25 -07:00 |
|
Debi King (Dessie)
|
fce8bda3b6
|
merged .hgtags
|
2011-08-02 16:14:16 -04:00 |
|
Merov Linden
|
9c45c06e8f
|
Fix build of llimage_libtest
|
2011-08-02 13:11:52 -07:00 |
|
Dave Parks
|
9883c33993
|
SH-2183 Thread local storage initialization is unreliable.
|
2011-08-02 12:47:35 -05:00 |