Commit Graph

1246 Commits (5dcd81c15507ad8f487e5727bc7a94de82f6fb45)

Author SHA1 Message Date
Brad Payne (Vir Linden) 0200135224 merge 2016-10-18 16:59:15 -04:00
Brad Payne (Vir Linden) 2be27c26e8 merge 2016-09-20 08:12:56 -04:00
Rider Linden 100aa4b79e Merge 2016-09-16 14:59:52 -07:00
Rider Linden 884b03e877 Merge 2016-09-16 14:43:35 -07:00
Rider Linden 51236b7c9c Merge 2016-09-14 09:55:18 -07:00
Nat Goodspeed 6b24122857 Automated merge with ssh://bitbucket.org/lindenlab/viewer-vlc 2016-08-29 17:06:12 -04:00
Nat Goodspeed 4c41b1d8ac MAINT-5011: Add top-level exception handlers in LLAppViewer::frame(). 2016-08-26 15:56:47 -04:00
AndreyL ProductEngine 3d9c39c77c MAINT-6663 [Win LibVLC] test video buttons still appearing in search 2016-08-20 12:53:03 +03:00
Nat Goodspeed e72bdc9bc5 Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2016-08-17 11:41:12 -04:00
Nat Goodspeed 5e9d2f57c8 MAINT-5011: Use LLTHROW() instead of plain BOOST_THROW_EXCEPTION().
A level of preprocessor indirection lets us later change the implementation if
desired.
2016-08-17 11:36:24 -04:00
pavelkproductengine 05e77c5f26 Merge VOB with 4.0.8-release 2016-08-16 20:40:57 +03:00
Brad Payne (Vir Linden) 57da9bcd1b merge from viewer-release 2016-08-15 09:52:06 -04:00
Oz Linden 6ff420d705 merge changes for 4.0.7-release 2016-08-11 15:36:09 -04:00
Nat Goodspeed 9c49a6c91d MAINT-5011: Introduce LLException base class for viewer exceptions.
This also introduces LLContinueError for exceptions which should interrupt
some part of viewer processing (e.g. the current coroutine) but should attempt
to let the viewer session proceed.

Derive all existing viewer exception classes from LLException rather than from
std::runtime_error or std::logic_error.

Use BOOST_THROW_EXCEPTION() rather than plain 'throw' to enrich the thrown
exception with source file, line number and containing function.
2016-07-19 16:25:25 -04:00
Nat Goodspeed 2f003fd5a9 MAINT-5011: Throw an actual exception in Force Software Exception.
http://en.cppreference.com/w/cpp/language/throw says of the plain throw syntax:

"This form is only allowed when an exception is presently being handled (it
calls std::terminate if used otherwise)."

On advice from Oz, replace plain 'throw;' with throwing a std::runtime_error.
2016-07-13 14:58:12 -04:00
Nat Goodspeed 464a0df4c1 DRTVWR-418: Unify control flow through LLAppViewer across platforms.
The LLApp API used to consist of init(), mainLoop(), cleanup() methods. This
makes sense -- but on Mac that structure was being subverted. The method
called mainLoop() was in fact being called once per frame. There was
initialization code in the method, which (on Mac) needed to be skipped with an
already-initialized bool. There was a 'while' loop which (on Mac) needed to be
turned into an 'if' instead so the method would return after every frame.

Rename LLApp::mainLoop() to frame(). Propagate through subclasses LLAppViewer
and LLCrashLogger. Document the fact that frame() returns true to mean "done."
(This was always the case, but had to be inferred from the code.)

Rename the Mac Objective-C function mainLoop to oneFrame. Rename the C++ free
function it calls from runMainLoop() to pumpMainLoop(). Add comments to
llappdelegate-objc.mm explaining (inferred) control flow.

Change the Linux viewer main() and the Windows viewer WINMAIN() from a single
LLAppViewer::mainLoop() call to repeatedly call frame() until it returns true.

Move initialization code from the top of LLAppViewer::frame() to the init()
method, where it more properly belongs. Remove corresponding
mMainLoopInitialized flag (and all references) from LLAppViewer.

Remove 'while (! LLApp::isExiting())' (or on Mac, 'if (! LLApp::isExiting())')
from LLAppViewer::frame() -- thus unindenting the whole body of the 'while'
and causing many lines of apparent change. (Apologies to reviewers.)

There are four LLApp states: APP_STATUS_RUNNING, APP_STATUS_QUITTING,
APP_STATUS_STOPPED and APP_STATUS_ERROR. Change LLAppViewer::frame() return
value from (isExiting()) (QUITTING or ERROR) to (! isRunning()). I do not know
under what circumstances the state might transition to STOPPED during a
frame() call, but I'm quite sure that if it does, we don't want to call
frame() again. We only want a subsequent call if the state is RUNNING.

Also rename mainLoop() method in LLCrashLogger subclasses
LLCrashLoggerWindows, LLCrashLoggerMac, LLCrashLoggerLinux. Of course it's
completely up to the frame() method whether to yield control; none of those in
fact do. Honor protocol by returning true (frame() is done), even though each
one's main() caller ignores the return value.

In fact LLCrashLoggerWindows::mainLoop() wasn't using the return protocol
correctly anyway, returning wParam or 0 or 1 -- possibly because the return
protocol was never explicitly documented. It should always return true: "I'm
done, don't call me again."
2016-06-30 16:51:50 -04:00
Brad Payne (Vir Linden) 93bafda56b MAINT-6366 - diagnostics related to animation asset downloads 2016-06-13 09:15:42 -04:00
pavelkproductengine 9f789ddfba MAINT-5194 Visual Outfit browser
Made refactoring of LLFloaterOutfitSnapshot and LLFloaterSnapshot
2016-06-02 20:23:46 +03:00
Callum Prentice 08b8e053f4 Fix typo in platform test for CEF version 2016-05-26 13:50:24 -07:00
callum_linden 70a38880fa Put back QuickTime plugin code for OS X only (untested - moving code to OS X dev) 2016-05-26 12:50:54 -07:00
pavelkproductengine 4d9b3cd725 Merge VOB with release 4.0.6 2016-05-24 18:37:20 +03:00
callum_linden 05fcb7c812 Automated merge with tip of viewer-release 2016-05-23 16:50:56 -07:00
Brad Payne (Vir Linden) f47ceb47bb merged jelly-doll viewer-release into bento 2016-05-21 08:15:28 -04:00
callum_linden ed73eae302 Added support for arbitrary URLs and cleaned up code 2016-05-10 13:07:34 -07:00
AndreyL ProductEngine c50f96b492 Merged in lindenlab/viewer-lynx 2016-05-20 02:06:08 +03:00
andreykproductengine b756b47d08 MAINT-6383 SLT timestamp in "About second life" floater 2016-05-13 19:42:27 +03:00
Mnikolenko Productengine b1243c55e5 Merged in oz_linden/maint-5974 2016-05-10 16:09:25 +03:00
callum_linden 337ad8a76f Add version info 2016-05-09 18:40:01 -07:00
Brad Payne (Vir Linden) d69c01ba80 merge 2016-05-06 16:29:34 -04:00
Oz Linden 950c41d184 merge 4.0.4-release and MAINT-5974 2016-05-06 10:28:42 -04:00
pavelkproductengine 4125bebce7 MAINT-6226 Incorporate a customized Snapshot feature to Outfit Browser flow
Initial version, further refactoring pending
2016-04-29 20:28:11 +03:00
Oz Linden ddd476c90c MAINT-6322 fix merge error that prevented crash dumps from being located for upload (and add better logging) 2016-04-20 11:52:00 -04:00
Oz Linden ecdb190d70 MAINT-6322 fix merge error that prevented crash dumps from being located for upload (and add better logging) 2016-04-20 11:52:00 -04:00
Oz Linden 9be58e915a merge with 4.0.3-release 2016-04-04 15:53:09 -04:00
Brad Payne (Vir Linden) caf4f49437 merge 2016-04-01 08:35:38 -04:00
Brad Payne (Vir Linden) 2afde26d93 merge 2016-03-21 11:00:22 -04:00
Rider Linden b8c1976460 Merge 2016-03-17 13:14:21 -07:00
Oz Linden 31f3db0291 merge changes for DRTVWR-417 2016-03-16 13:08:06 -04:00
Oz Linden 5822fb00b6 merge DRTVWR-398 build cleanup fixes 2016-03-07 12:41:11 -05:00
Oz Linden f3b1efae5d put the KDU, Fmod*, and CEF versions back in the About info 2016-02-07 10:26:34 -08:00
Oz Linden b46627ffc4 add build configuration to the About box if it is not Release
remove some superfluous other information from About
2016-02-04 23:32:42 -05:00
Oz Linden bc22e58743 merge changes for 4.0.1-release 2016-01-15 16:55:04 -05:00
Brad Payne (Vir Linden) 3612d7d14b merge 2016-01-15 16:42:39 -05:00
Rider Linden e7eaa94dfa Merge VR 2016-01-15 13:36:38 -08:00
andreykproductengine 5a6fce5b62 MAINT-489 various cache and log files not being deleted 2016-01-04 19:10:51 +02:00
AndreyL ProductEngine 60dfd55eda Merge downstream, version 4.0.1 2015-12-22 11:07:18 +02:00
Rider Linden 909e409743 Merge 2015-12-18 14:10:02 -08:00
Brad Payne (Vir Linden) 3f81bb15b3 merge 2015-12-18 13:55:41 -05:00
Rider Linden 6dd80980cf Merge 2015-12-18 10:16:26 -08:00
rider f4b6a89ab0 Throttle consecutive connect attempts. 2015-12-15 11:13:47 -08:00