summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-28DRTVWR-418: Double coroutine stack size for 64-bit buildsNat Goodspeed
on the advice of NickyD.
2016-06-27DRTVWR-418: Update to colladadom, googlemock, llceflib with boost build 316951Nat Goodspeed
2016-05-19Automated merge with tip of viewer-release to pick up 4.0.5callum_linden
2016-05-19increment viewer version to 4.0.6Oz Linden
2016-05-19Added tag 4.0.5-release for changeset 450de775fff6Oz Linden
2016-05-10merge changes for MAINT-6392Oz Linden
2016-05-09MAINT-6392: Do not change the URL used for getting cookies (except to pass ↵Rider Linden
it to CEF) The original URL is used for HTTP Core access to profile functionality.
2016-05-07gratuitous change for new ticket numberOz Linden
2016-05-06Automatic merge with headcallum_linden
2016-05-06Merge with https://bitbucket.org/oz_linden/maint-5974 to pick up a variety ↵callum_linden
of fixes
2016-05-06Merge with viewer-releasecallum_linden
2016-05-06merge 4.0.4-release and MAINT-5974Oz Linden
2016-05-06fix cmake warning by conditionalizing dependency that does not exist on MacsOz Linden
2016-05-06merge changes for 4.0.4-releaseOz Linden
2016-05-06increment viewer version to 4.0.5Oz Linden
2016-05-06Added tag 4.0.4-release for changeset 0a5de9ec2cb8Oz Linden
2016-05-05various changes required to compile on new clangOz Linden
2016-05-04cosmetic fixes to basic graphics and preset selectionOz Linden
2016-05-04add max avatar complexity slider to basic graphics preferencesOz Linden
2016-05-02Fixed disabling of Windows error reportingAnsariel
2016-05-02Fixed startup crash on WindowsAnsariel Hiller
2016-04-29MAINT-6373: allow user to ignore notices about whether or not they are being ↵Oz Linden
rendered
2016-04-29Adjust some avatar complexity defaults (mostly slightly upwards)Oz Linden
Make more settings between mac and windows the same Remove solaris and xp featuretables, since we don't support them any more
2016-04-28minor code clarity improvementsOz Linden
2016-04-28adjust avatar complexity defaults to be more generous and more consistentOz Linden
2016-04-28clean up terminology for jelly dolls / avatar complexityOz Linden
2016-04-28shorted default time for complexity noticesOz Linden
2016-04-26DRTVWR-418: Match KDU_X86_INTRINSICS macro set for KDU package build.Nat Goodspeed
2016-04-26MergeRider Linden
2016-04-26MAINT-6336: Initialize TempBoundListener with constructorRider Linden
2016-04-26DRTVWR-418: add preprocessor define to fix linker error introduced in v7.8callum_linden
2016-04-26MAINT-6336: Put the timeout upstream of the suspending pump and fire the ↵Rider Linden
timeout it. Also some cleanup on LLSD construction in vivox.
2016-04-26Suppress avatar complexity notices if ShowMyComplexityChanges is zeroOz Linden
2016-04-26allow warnings from autobuildOz Linden
2016-04-25Automated merge with ssh://bitbucket.org/lindenlab/viewer64Nat Goodspeed
2016-04-25DRTVWR-418: Fix indra/llkdu wrapper for changes in KDU 7.8 API.Nat Goodspeed
KDU 7.8 introduces a number of changes to its API, most notably by moving public symbols into a variety of kdu_something namespaces. While this is laudable in a general sense, it does require quite a bit of diagnostic building and patching to update legacy code. Since llimagej2ckdu_test.cpp lamentably stubs out pretty much the entire KDU API, we must also fix those stubs for signature changes even to functions we don't otherwise reference. NOTE: This commit still leaves four symbols undefined. Below I have taken the liberty of juxtaposing the error line with the output from dumpbin /exports build-vc120/packages/lib/release/kdu.lib. I see no differences. unresolved symbol (?kdu_convert_ycc_to_rgb_rev16@kdu_core@@3P6AXPAF00H@ZA) "void (__cdecl* kdu_core::kdu_convert_ycc_to_rgb_rev16)(short *,short *,short *,int)" ?kdu_convert_ycc_to_rgb_rev16@kdu_core@@3P6AXPAF00H@ZA (void (__cdecl* kdu_core::kdu_convert_ycc_to_rgb_rev16)(short *,short *,short *,int)) unresolved symbol (?kdu_convert_ycc_to_rgb_irrev16@kdu_core@@3P6AXPAF00H@ZA) "void (__cdecl* kdu_core::kdu_convert_ycc_to_rgb_irrev16)(short *,short *,short *,int)" ?kdu_convert_ycc_to_rgb_irrev16@kdu_core@@3P6AXPAF00H@ZA (void (__cdecl* kdu_core::kdu_convert_ycc_to_rgb_irrev16)(short *,short *,short *,int)) unresolved symbol (?kdu_convert_ycc_to_rgb_rev32@kdu_core@@3P6AXPAH00H@ZA) "void (__cdecl* kdu_core::kdu_convert_ycc_to_rgb_rev32)(int *,int *,int *,int)" ?kdu_convert_ycc_to_rgb_rev32@kdu_core@@3P6AXPAH00H@ZA (void (__cdecl* kdu_core::kdu_convert_ycc_to_rgb_rev32)(int *,int *,int *,int)) unresolved symbol (?kdu_convert_ycc_to_rgb_irrev32@kdu_core@@3P6AXPAM00H@ZA) "void (__cdecl* kdu_core::kdu_convert_ycc_to_rgb_irrev32)(float *,float *,float *,int)" ?kdu_convert_ycc_to_rgb_irrev32@kdu_core@@3P6AXPAM00H@ZA (void (__cdecl* kdu_core::kdu_convert_ycc_to_rgb_irrev32)(float *,float *,float *,int)) 24>C:\Users\Nat\linden\viewer64\build-vc120\newview\RelWithDebInfo\secondlife-bin.exe : fatal error LNK1120: 4 unresolved externals
2016-04-25DRTVWR-418: Fix MD5 hashes for KDU 314311 packages.Nat Goodspeed
2016-04-25MergeRider Linden
2016-04-25MAINT-6338: Add methods for getting and setting boolean properties from ↵Rider Linden
gSavedSettings in the HTTPCore. Use those methods to access new key HTTPLogBodyOnError. Dump body of HTTP message to log in case of error if this key is true.
2016-04-22Debug code snuck in.Rider Linden
2016-04-22MergeRider Linden
2016-04-22DRTVWR-418 Remove references to gtk-atk-pango-glib from Windows build since ↵callum_linden
it's not used there
2016-04-22DRTVWR-418 Update the version of cef-bin via llceflib that we consume (no ↵callum_linden
code changes, just updating to latest after changes to documentation/private status)
2016-04-22MAINT-6336: Centralize waiting on event pump with a timeout. Shorten the ↵Rider Linden
lifespan of a timeout event pump lifespan to be no longer than necessary. Change all references to the LLEventTimer to instead uses the centralized version.
2016-04-22spruce up the README (I needed a change to force a new build number)Oz Linden
2016-04-21DRTVWR-418 pull in fixed (all headers) version of NVAPIcallum_linden
2016-04-22Merged lindenlab/viewer-bear into defaultAndrey Lihatskiy