summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-07-07Automated merge with tip of viewer-releasecallum_linden
2016-07-07MAINT-6527 FIX -volume plays at full amount +50m away - volume was not set ↵callum_linden
for media outside attenuation zone so played at random value
2016-07-06mergeBrad Payne (Vir Linden)
2016-07-06SL-424 - more proposed skeleton/slider fixesBrad Payne (Vir Linden)
2016-07-06mergeBrad Payne (Vir Linden)
2016-07-07Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2016-07-06increment viewer version to 4.0.7Oz Linden
2016-07-06Added tag 4.0.6-release for changeset 4070611edd95Oz Linden
2016-07-05SL-109 - little bit of log spam cleanupBrad Payne (Vir Linden)
2016-07-05SL-402 - update mBodySize more frequently to avoid inconsistent vertical ↵Brad Payne (Vir Linden)
positioning of avatar.
2016-07-05MAINT-5388 File "conversation.log" created in users' root directory on Windowsandreykproductengine
2016-07-06MAINT-4066 Missing notificationsandreykproductengine
2016-07-07MAINT-6552 One more nullcheckAndreyL ProductEngine
2016-07-07Merged in lindenlab/viewer-lynxAndreyL ProductEngine
2016-07-06MAINT-6552 Contribution: Viewer sometimes crashes when opening oversized ↵AndreyL ProductEngine
textures
2016-07-05MAINT-6550 Graphic preset name including "\" causes preset to be unusable & ↵Mnikolenko Productengine
preset cannot be deleted.
2016-07-04MAINT-6259 rigged items' LOD should be size dependent, not only avatar dependentandreykproductengine
2016-07-01MAINT-6481 FIX Media controls not presentcallum_linden
2016-07-01DRTVWR-418: Update to llphysicsextensions_stub build 314246Nat Goodspeed
2016-07-01DRTVWR-418: Update to llphysicsextensions_source build 314244Nat Goodspeed
2016-07-01DRTVWR-418: Update to libuuid build 314269Nat Goodspeed
2016-07-01DRTVWR-418: Update to gstreamer build 314267Nat Goodspeed
2016-07-01DRTVWR-418: Update to fontconfig build 314281Nat Goodspeed
2016-07-01DRTVWR-418: Update to dbus-glib build 314266Nat Goodspeed
2016-07-01DRTVWR-418: Update to boost build 316951Nat Goodspeed
2016-07-01SL-402 - more avatar height tracing in debug textBrad Payne (Vir Linden)
2016-07-01Automated merge with ssh://bitbucket.org/nat_linden/viewer-mac-mainloopNat Goodspeed
2016-07-01DRTVWR-418: Update to llappearance_utility fixed for LLApp::frame()Nat Goodspeed
2016-06-30DRTVWR-418: Unify control flow through LLAppViewer across platforms.Nat Goodspeed
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-29merge changes for buildscriptsOz Linden
2016-06-29MAINT-2141 Sky Cloud Coverage reverts to 0.27 when toggling view back to ↵andreykproductengine
region sky
2016-06-29SL-426 - strings.xml fix for pec attachments, SL-402 - diagnostics for ↵Brad Payne (Vir Linden)
investigation
2016-06-28DRTVWR-418: Double coroutine stack size for 64-bit buildsNat Goodspeed
on the advice of NickyD.
2016-06-28Fixed up broken XML for Web Content Browser test video URL buttonscallum_linden
2016-06-27MAINT-6518 allow negative numbered chat channelsandreykproductengine
2016-06-27DRTVWR-418: Update to colladadom, googlemock, llceflib with boost build 316951Nat Goodspeed
2016-06-27SL-124 - code cleanupBrad Payne (Vir Linden)
2016-06-25SL-344 - fixes for scaling of mEye and mAltEye bonesBrad Payne (Vir Linden)
2016-06-24SL-124 - comment cleanup, fixed a crash if skinned mesh has no valid joint ↵Brad Payne (Vir Linden)
names defined
2016-06-24MAINT-6487 After editing an object with a large number of contents, contents ↵andreykproductengine
in any object will not load until relog.
2016-06-24Merged in rider_linden/viewer-bear (pull request #13)Andrey Lihatskiy
MAINT-6521: A compare against a static const empty string causes segfault in integration tests on Mac and Linux.
2016-06-24MergeRider Linden
2016-06-24MAINT-6521: A compare against a static const empty string causes segfault in ↵Rider Linden
integration tests on Mac and Linux. Use empty() test instead.
2016-06-24SL-344 - additional slider updates, including scaling of mEye bonesBrad Payne (Vir Linden)
2016-06-24Merged in lindenlab/viewer-bearAndreyL ProductEngine
2016-06-23MergeRider Linden
2016-06-23MAINT-6521: Allow anonymous connections to bypass the dependency and order ↵Rider Linden
tracking.
2016-06-23MAINT-6516 FIXED Crash in updateEditFieldValues() while in Pathfinding -> ↵Mnikolenko Productengine
Linksets floater
2016-06-22SL-117, SL-344 - additional proposed updates for skeleton, slidersBrad Payne (Vir Linden)
2016-06-22MergeRider Linden