Commit Graph

40429 Commits (bd008a170898e69beeb8bc0481b4bfd94de86c55)

Author SHA1 Message Date
callum_linden 247c99f678 Automated merge with tip of viewer-release 2016-07-07 09:16:51 -07:00
callum_linden 067fb12656 Automated merge with tip of viewer-release 2016-07-07 09:13:52 -07:00
callum_linden d59ce04495 MAINT-6527 FIX -volume plays at full amount +50m away - volume was not set for media outside attenuation zone so played at random value 2016-07-07 09:10:39 -07:00
Brad Payne (Vir Linden) 4807d27458 merge 2016-07-06 20:07:14 -04:00
Brad Payne (Vir Linden) 880fd82d0b SL-424 - more proposed skeleton/slider fixes 2016-07-06 20:06:50 -04:00
Brad Payne (Vir Linden) fa4339f3c7 merge 2016-07-06 18:21:25 -04:00
AndreyL ProductEngine c7c8fac310 Merged in lindenlab/viewer-release 2016-07-07 00:15:41 +03:00
Oz Linden f868e29945 increment viewer version to 4.0.7 2016-07-06 16:52:24 -04:00
Oz Linden e67b8e3095 Added tag 4.0.6-release for changeset 4070611edd95 2016-07-06 16:52:23 -04:00
Glenn Glazer bb19a1e9cc SL-323: apply update code, v2 2016-07-05 13:44:43 -07:00
Glenn Glazer 7e120a61d1 remove first version of apply_update 2016-07-05 13:43:50 -07:00
Brad Payne (Vir Linden) cba0bb3038 SL-109 - little bit of log spam cleanup 2016-07-05 16:18:50 -04:00
Brad Payne (Vir Linden) 3bc8a97440 SL-402 - update mBodySize more frequently to avoid inconsistent vertical positioning of avatar. 2016-07-05 14:42:47 -04:00
Glenn Glazer 924e80142f SL-323: apply update code 2016-07-05 08:06:03 -07:00
andreykproductengine 4b29e9869c MAINT-5388 File "conversation.log" created in users' root directory on Windows 2016-07-05 17:52:01 +03:00
andreykproductengine 9b7f38f6fb MAINT-4066 Missing notifications 2016-07-06 17:49:47 +03:00
AndreyL ProductEngine ee40764c45 MAINT-6552 One more nullcheck 2016-07-07 02:30:30 +03:00
AndreyL ProductEngine 7718f3a9a3 Merged in lindenlab/viewer-lynx 2016-07-07 00:59:47 +03:00
AndreyL ProductEngine 69de29d74e MAINT-6552 Contribution: Viewer sometimes crashes when opening oversized textures 2016-07-06 10:22:50 +03:00
Mnikolenko Productengine 85fd2dc870 MAINT-6550 Graphic preset name including "\" causes preset to be unusable & preset cannot be deleted. 2016-07-05 18:23:14 +03:00
andreykproductengine 60c0c0e0e4 MAINT-6259 rigged items' LOD should be size dependent, not only avatar dependent 2016-07-04 19:55:54 +03:00
callum_linden 5f57257185 MAINT-6481 FIX Media controls not present 2016-07-01 14:52:51 -07:00
Nat Goodspeed d8d268e4eb DRTVWR-418: Update to llphysicsextensions_stub build 314246 2016-07-01 17:01:56 -04:00
Nat Goodspeed 879a5afd46 DRTVWR-418: Update to llphysicsextensions_source build 314244 2016-07-01 17:01:03 -04:00
Nat Goodspeed 406c6107ac DRTVWR-418: Update to libuuid build 314269 2016-07-01 16:56:36 -04:00
Nat Goodspeed 32f7ddbf53 DRTVWR-418: Update to gstreamer build 314267 2016-07-01 16:53:09 -04:00
Nat Goodspeed 638da5e632 DRTVWR-418: Update to fontconfig build 314281 2016-07-01 16:51:02 -04:00
Nat Goodspeed 1e2d4ac5a6 DRTVWR-418: Update to dbus-glib build 314266 2016-07-01 16:49:32 -04:00
Nat Goodspeed 41b6edf040 DRTVWR-418: Update to boost build 316951 2016-07-01 16:47:34 -04:00
Brad Payne (Vir Linden) 99250b4e0c SL-402 - more avatar height tracing in debug text 2016-07-01 15:12:55 -04:00
Nat Goodspeed 8854f5ca29 Automated merge with ssh://bitbucket.org/nat_linden/viewer-mac-mainloop 2016-07-01 14:11:45 -04:00
Nat Goodspeed 1a3fa64ecc DRTVWR-418: Update to llappearance_utility fixed for LLApp::frame() 2016-07-01 12:14:08 -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
Oz Linden bea18c933b merge changes for buildscripts 2016-06-29 15:24:58 -04:00
andreykproductengine c2320fa0d0 MAINT-2141 Sky Cloud Coverage reverts to 0.27 when toggling view back to region sky 2016-06-29 16:44:25 +03:00
Brad Payne (Vir Linden) 5ebf9b3cae SL-426 - strings.xml fix for pec attachments, SL-402 - diagnostics for investigation 2016-06-29 09:41:06 -04:00
Nat Goodspeed 6f6c8fa5ff DRTVWR-418: Double coroutine stack size for 64-bit builds
on the advice of NickyD.
2016-06-28 18:27:39 -04:00
callum_linden 26e4a99f40 Fixed up broken XML for Web Content Browser test video URL buttons 2016-06-28 15:24:01 -07:00
Glenn Glazer 9bc49fb4bd SL-323: post review comments on downloader 2016-06-28 11:34:05 -07:00
Glenn Glazer cb90597b4e remove extraneous comments 2016-06-27 16:20:10 -07:00
Glenn Glazer e01f616899 SL-323: multithreaded downloader with progress bar 2016-06-27 15:30:57 -07:00
andreykproductengine 9ce396442f MAINT-6518 allow negative numbered chat channels 2016-06-27 17:21:14 +03:00
Nat Goodspeed 8fe3a06c1d DRTVWR-418: Update to colladadom, googlemock, llceflib with boost build 316951 2016-06-27 10:05:31 -04:00
Brad Payne (Vir Linden) 7f904fbcbd SL-124 - code cleanup 2016-06-27 08:48:15 -04:00
Brad Payne (Vir Linden) 84bdf7f626 SL-344 - fixes for scaling of mEye and mAltEye bones 2016-06-25 08:54:41 -04:00
Brad Payne (Vir Linden) b649847fe9 SL-124 - comment cleanup, fixed a crash if skinned mesh has no valid joint names defined 2016-06-24 16:43:23 -04:00
andreykproductengine 9e985120fe MAINT-6487 After editing an object with a large number of contents, contents in any object will not load until relog. 2016-06-24 17:08:11 +03:00
Andrey Lihatskiy 7b1af4caa9 Merged in rider_linden/viewer-bear (pull request #13)
MAINT-6521: A compare against a static const empty string causes segfault in integration tests on Mac and Linux.
2016-06-24 22:07:24 +03:00
Rider Linden c51b472093 Merge 2016-06-24 11:58:57 -07:00
Rider Linden c8f8bbf75f MAINT-6521: A compare against a static const empty string causes segfault in integration tests on Mac and Linux. Use empty() test instead. 2016-06-24 10:22:18 -07:00