Kitty Barnett
|
a321a00bef
|
Merged with default tip (Revision 0fd2a1181a96)
--HG--
branch : .RLVa
|
2011-08-06 16:18:41 +02:00 |
|
Kitty Barnett
|
2d9b37a48e
|
- fixed : LL supplied llconvexdecompositionstub isn't up to date
--HG--
branch : Viewer-Build
|
2011-08-06 14:59:29 +02:00 |
|
Kitty Barnett
|
9c5121df46
|
Merged with default tip (Revision 0fd2a1181a96)
--HG--
branch : Viewer-Build
|
2011-08-06 11:23:09 +02: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 |
|
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
|
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 |
|
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 |
|
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 |
|
Dave Parks
|
aa0e35142a
|
SH-2183 Only apply multi-threaded curl on the main thread.
|
2011-08-02 12:23:50 -05:00 |
|
Vadim ProductEngine
|
f8a17690bc
|
STORM-1291 FOLLOWUP Localized common (unisex) gestures.
|
2011-08-02 18:37:14 +03:00 |
|
Dave Parks
|
fbd5bd7adc
|
SH-2183 Add a debug setting to control whether or not to use multiple threads in LLCurl
|
2011-08-01 17:50:43 -05:00 |
|
Oz Linden
|
9eb555bbe6
|
merge changes for storm-1535
|
2011-08-01 17:09:25 -04:00 |
|
Oz Linden
|
5f71e29d8a
|
remove accidentally checked-in patch file
|
2011-08-01 17:08:47 -04:00 |
|
Oz Linden
|
cfacd12d13
|
increment viewer version to 2.8.4
|
2011-08-01 09:47:39 -04:00 |
|
Oz Linden
|
1791685ba3
|
Added tag 2.8.3-start for changeset ac0f1a132d35
|
2011-08-01 09:46:56 -04:00 |
|
Roxie Linden
|
468d810486
|
Include some certs that were missed in the latest cert update. Specifically,
paypal had a verisign -2 CA cert, and the new trust list only includes -3.
Also, disable use of the system cert store. Just use our list.
|
2011-07-29 19:48:52 -07:00 |
|
Richard Linden
|
c7a2f5c4fb
|
EXP-1057 FIX Cursor doesn't go to the input field on the Find Floater due to lack of window focus
also allow right clip to copy url from disabled address bar
|
2011-07-29 17:29:02 -07:00 |
|
Dave Parks
|
5711fda52f
|
SH-2200 Fix for BSOD on 7800 Go on Vista when setting graphics detail to "High"
|
2011-07-29 18:49:09 -05:00 |
|
Dave Parks
|
a234d24331
|
STORM-1512 Fix for crash when rendering impostors.
|
2011-07-29 23:59:52 -05:00 |
|
Richard Linden
|
feddda6740
|
EXP-1056 FIX Web popup issues with Web Content Browser
changed browser id back to a string so it accepts malformed uuid strings
coming from webkit - "{uuid}" instead of "uuid"
|
2011-07-29 16:38:07 -07:00 |
|
Oz Linden
|
74f6c995ab
|
merge changes for storm-1510
|
2011-07-29 15:19:26 -04:00 |
|
Oz Linden
|
62a8fec884
|
merge changes for late release fixes
|
2011-07-29 15:17:25 -04:00 |
|
Oz Linden
|
6850f13f50
|
late fix to set watchdog on at 60 seconds
|
2011-07-29 15:08:27 -04:00 |
|
Oz Linden
|
67bd8c314c
|
late fix to disable VBO on Macs for performance
|
2011-07-29 15:07:52 -04:00 |
|
Debi King (Dessie)
|
fb9f092972
|
reconciled .hgtags
|
2011-07-29 13:32:51 -04:00 |
|
Debi King (Dessie)
|
ad96a4ef47
|
mergeback from viewer-release
|
2011-07-29 13:29:32 -04:00 |
|
Debi King (Dessie)
|
75c1dbd74e
|
Added tag DRTVWR-70_2.8.0-release, 2.8.0-release for changeset 493d9127ee50
|
2011-07-29 13:09:45 -04:00 |
|
Oz Linden
|
8d2dea5e9d
|
merge changes for storm-1451
|
2011-07-29 11:11:39 -04:00 |
|
Oz Linden
|
73a1a0636e
|
merge changes for storm-1408
|
2011-07-29 11:11:15 -04:00 |
|
Oz Linden
|
2441abb7f3
|
merge changes for storm-1405
|
2011-07-29 11:10:47 -04:00 |