Commit Graph

20135 Commits (ed734e2a18b1c5e66dcafe5b4bd3991e0252acb7)

Author SHA1 Message Date
Kitty Barnett ed734e2a18 Merged with Appearance-MixedViewers tip
--HG--
branch : .RLVa
2011-08-26 11:06:23 +02:00
Kitty Barnett 6b3fbb5cc7 Merged with Appearance-Misc tip
--HG--
branch : .RLVa
2011-08-26 11:06:04 +02:00
Kitty Barnett 09f3482542 Merged with Viewer-Build tip
--HG--
branch : Appearance-MixedViewers
2011-08-24 13:54:03 +02:00
Kitty Barnett b547595ed4 Merged with Viewer-Build tip
--HG--
branch : Appearance-Misc
2011-08-24 13:53:45 +02:00
Kitty Barnett accb19a9c5 - internal : updated patch description for Viewer-Build
--HG--
branch : Viewer-Build
2011-08-20 21:16:59 +02:00
Kitty Barnett 4e5bfda7e2 - changed : set the "FMOD" flag to TRUE for the (Windows) ReleaseOS build configuration
--HG--
branch : Viewer-Build
2011-08-06 21:49:05 +02:00
Kitty Barnett d46e071c79 - changed : set the "UNATTENDED" flag to FALSE for all (Windows) *OS build configurations
--HG--
branch : Viewer-Build
2011-08-06 21:48:27 +02:00
Kitty Barnett 574f97a705 Updated patch branch dependencies
--HG--
branch : .RLVa
2011-08-06 16:21:45 +02:00
Kitty Barnett 58657ef036 Merged with Appearance-Misc tip
--HG--
branch : .RLVa
2011-08-06 16:21:14 +02:00
Kitty Barnett e0983d7923 Merged with Appearance-MixedViewers tip
--HG--
branch : .RLVa
2011-08-06 16:19:52 +02:00
Kitty Barnett a321a00bef Merged with default tip (Revision 0fd2a1181a96)
--HG--
branch : .RLVa
2011-08-06 16:18:41 +02:00
Kitty Barnett 3c7fb38745 Merged with default tip (Revision 0fd2a1181a96)
--HG--
branch : Appearance-Misc
2011-08-06 15:19:24 +02:00
Kitty Barnett fc0f77502a update patch dependencies
--HG--
branch : Appearance-Misc
2011-08-06 15:16:26 +02:00
Kitty Barnett e9503467e1 Merged with default tip (Revision 0fd2a1181a96)
--HG--
branch : Appearance-MixedViewers
2011-08-06 15:08:50 +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