summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2018-01-24MAINT-8232 Clear History button description should not include 'web'callum_linden
2018-01-22Bring in the very latest version of Dullahan (1.1.1024) that matches the ↵callum_linden
most recent canonical Dullahan and also bump the CEF plugin version in preparation for the RC build
2018-01-22MAINT-8207 Tweak web/cookie UI in viewer prefscallum_linden
2018-01-19After reforking the post viewer64 viewer-release repository, I pulled in all ↵callum_linden
the changes from my viewer64 based viewe64-media-update repository. This repository is the canonical one going forwards
2018-01-17Fixes for 'MAINT-8196 Remove LLPluginCookieStore from the viewer' and ↵callum_linden
'MAINT-8194 Remove per-frame calls to updateJavascriptObject()'
2018-01-16increment viewer version to 5.1.1Oz Linden
2018-01-11Fix for MAINT-8177 Expose the full version of the matching Chromium/Chrome ↵callum_linden
build for CEF in the About box
2018-01-08Fix for MAINT-7886 Resizing internal web browser window causes video ↵callum_linden
playback to stop
2018-01-08Bump CEF Plugin version so it can be identified as differentcallum_linden
2018-01-08Automated merge with tip of lindenlab/viewer64callum
2018-01-05Automated merge with tip of viewer64callum_linden
2018-01-05Fix for MAINT-8119 - this bug morphed from a packaging issue to being all ↵callum_linden
about audio not playing when a media stream started. There is some as yet, unknown interaction between the volume catcher code in the CEF plugin and the VLC volume controls. The fix for now is to add a Windows call to the VLC code that sets the process volume explicitly. Later we will address the volume catcher code, move it to a common spot so both CEF and LibVLC can use the same bytes
2018-01-05Fix for MAINT-8148 - AVI fails to play. For Windows, the x-msvideo MIME type ↵callum_linden
was pointed at CEF which is unable to play it. Switching that to LibVLC made it work as expected. It was already switched on macOS
2018-01-03Automated merge with tip of viewer64callum_linden
2017-12-21MAINT-8119 Fix. A change elsewhere in the viewer_manifest.py script that ↵callum_linden
copies files into the right place after a build impacted the fragment of code that copies over the VLC runtime files (Libvlc.dll, libvlccore.dll and the VLC plugins dir) and they never made it to the right place. This change restores that copy
2017-12-20MAINT-8087: Use env vars from VMP for AppData\Roaming and Local.Nat Goodspeed
On Windows, when logged in with a non-ASCII username, every one of the three documented APIs -- SHGetSpecialFolderPath(), SHGetFolderPath() and SHGetKnownFolderPath() -- fails to retrieve any pathname at all. We cannot account for the fact that the oldest of these continues to work with the release viewer and within a Python script (though not, curiously, from a Python interactive session). With a non-ASCII username, they consistently fail when called from an Alex Ivy viewer build: "The filename, directory name, or volume label syntax is incorrect." Empirically, with a non-ASCII username, the preset APPDATA and LOCALAPPDATA environment variables are also useless, e.g. c:\Users\??????\AppData\Roaming where those are, yup, actual question marks. Empirically, the VMP is able to successfully call SHGetFolderPath() to retrieve both AppData\Roaming and AppData\Local. Therefore, we make the VMP set the APPDATA and LOCALAPPDATA environment variables to the UTF-8 encoded correct pathnames. Instead of calling SHGetSomethingFolderPath() at all, make LLDir_Win32 retrieve those environment variables. Make LLFile::mkdir() treat "directory already exists" as a success case. Every single call fell into one of two categories: either it didn't check success at all, or it tested specially to exempt errno == EEXIST. Migrate that test into mkdir(); eliminate it from call sites. Make LLDir::append() and add() convenience functions accept variadic arguments. Replace add(add()...) constructs, as well as clumsy concatenations of directory names and getDirDelimiter(), with simple variadic add() calls.
2017-12-18Automated merge with head of lindenlab/viewer64callum_linden
2017-12-15Pull in Dullahan 1.1.930 with improved fix for maint-8095 (target='_blank' ↵callum_linden
links) as well as an improvement for maint-8100 (no error message for invalid hostname / url)
2017-12-14MAINT-8087: New LLDir_Win32 code requires ole32 in a few more places.Nat Goodspeed
2017-12-14MAINT-8087: #include header for CoTaskMemFree() functionNat Goodspeed
which is required to free the pointer returned by SHGetKnownFolderPath().
2017-12-14MAINT-8087: Use SHGetKnownFolderPath(), not SHGetSpecialFolderPath().Nat Goodspeed
SHGetSpecialFolderPath() is deprecated, and empirically it appears to be failing when the user name contains non-ASCII characters. The relevant Microsoft documentation pages recommend calling SHGetKnownFolderPath() instead. Also, the SHGetSpecialFolderPath() calls had no error checking or reporting, which is why we can only say it "appears to be" failing. Make sure that if SHGetKnownFolderPath() fails, at least we try to tell somebody about it.
2017-12-14Pull in Dullahan 1.1.929 (multiple file picking support) and update plugin ↵callum_linden
code accordingly
2017-12-13Pull in Dullahan 1.1.925 with fix for onFileDialogCallback(..) handling that ↵callum_linden
fixes MAINT-8083
2017-12-13Automated merge with head of viewer64callum_linden
2017-12-12MAINT-8082: Make UpdaterMaximumBandwidth comment admit uselessness.Nat Goodspeed
2017-12-11Automated merge with tip of viewer64 *plus* update to CEF 3.3202.1686 / ↵callum_linden
Dullahan 901
2017-12-07MAINT-8069: Pass any command-line arguments through to SL_Launcher.Nat Goodspeed
2017-12-07MAINT-8070: Tweak macOS embedded app names (flyover text) per ProductNat Goodspeed
2017-12-06MAINT-7751: Respond to Coyot's code-review suggestions.Nat Goodspeed
2017-12-06MAINT-7751: Add shbang line to macOS trampoline script.Nat Goodspeed
This evidently makes all the difference as to whether the app is considered launchable.
2017-12-04MAINT-7751: Rework DarwinManifest to produce new app bundle structure.Nat Goodspeed
Specifically, Second Life.app is now mostly just a wrapper. Its Contents/ Resources contains nested Launcher.app (the VMP) and Viewer.app (the viewer itself). Most of what used to be in the top-level Second Life.app has been relocated to the embedded Viewer.app. VMP stuff has of course been extracted to Launcher.app. The top-level Second Life.app executable is now a tiny script that runs Launcher.app. This structure permits different icons and different Dock flyover text for the launcher and the viewer, hopefully ameliorating a certain amount of user confusion about the dual icons. This requires a corresponding VMP change: on macOS, the VMP must now find both its resources and the viewer executable by walking up from Launcher.app and down again into its sibling Viewer.app. Since Dock flyover text is determined by the embedded app names, allow Product to change these at will. That means we should be able to tweak exactly one variable assignment to change either of those embedded app names, without having to chase down other references scattered throughout the source repo. For that reason, create top-level trampoline SL_Launcher script dynamically: it must reference the launcher app by name. That means we must also perform (the equivalent of) chmod +x on that generated script. The one mystery surrounding this restructuring is that without a top-level Frameworks symlink pointing to the embedded Viewer.app's Frameworks directory (where CEF lives), CEF refuses to start: no splash screen, no MoP. Perhaps we can fix that someday. Use Python's bundled plistlib to generate Info.plist files for the embedded applications. Reorganize stray code stanzas to try to help the structure of the code more or less resemble the structure of the desired result. Add ViewerManifest.relpath() method to determine the relative path from a specified base to the target path. If base omitted, assumes get_dst_prefix() -- handy for creating symlinks. Determining exactly the right number of os.pardir instances to concatenate into the relative pathname for a symlink (or an install_name_tool stamp) was tedious, fragile and unobvious, difficult to desk-check. Using relpath() should make all that more robust. Migrate symlinkf() from free function to ViewerManifest method, refactoring into _symlinkf_prep_dst() and _symlinkf(), adding relsymlinkf(). This lets us add convenience features such as prepending get_dst_prefix() to the dest (the place where we want to create the symlink), defaulting dest to the basename of target and ensuring that the parent of that dest already exists -- as with LLManifest.path(). Moreover, since it makes no sense whatsoever to create an absolute symlink to some path on the build machine, relsymlinkf() creates every symlink relative to dirname(dest). That, in turn, lets us eliminate a certain amount of boilerplate around existing calls. (Also, since we now ensure the parent directory exists, scrap the logic to diagnose "nonexistent parent directory.") Make llmanifest.LLManifest.run_command() not pass shell=True to subprocess, thereby permitting (requiring) the list form rather than the string form. Change all existing calls to list form. This makes calls more readable, for two reasons. First, many of the arguments are taken from script variables; these can simply be dropped into the list instead of indirecting through string interpolation. Second, it eliminates the need to manually escape individual arguments, since subprocess promises to honor the distinction between list elements. Also fix LLManifest.put_in_file() to ensure the containing directory exists. Consolidate some viewer_manifest.py redundancy, e.g. copying the same set of ten DLLs from either of two directories depending on Release vs. Debug.
2017-12-02Automated merge with ssh://bitbucket.org/lindenlab/viewer64Nat Goodspeed
2017-11-29DRTVWR-418: Merge from latest viewer-releaseNat Goodspeed
2017-11-29increment viewer version to 5.0.10Oz Linden
2017-11-29MAINT-7751: Tidying up viewer_manifest.py a littleNat Goodspeed
2017-11-28Automated merge with ssh://bitbucket.org/lindenlab/viewer64Nat Goodspeed
2017-11-28MAINT-7751: Remove redundant viewer_manifest.py directory creation.Nat Goodspeed
The LLManifest.copy_action() method ensures that the destination directory for any file copy exists before trying to copy the file, specifically so we don't have to clutter the business logic with tests and explicit directory creation. Remove redundant os.makedirs() stanzas.
2017-11-21MAINT-7684: Stop packaging or signing download_update.exe.Nat Goodspeed
2017-11-20Pull in CEF 3203 (Dullanan 1.1.888) Chrome 62 build and re-enable WebGLcallum_linden
2017-11-17MAINT-7977: Per Graham, unbind textures as well as deleting.Nat Goodspeed
2017-11-17MAINT-7977: Additional cleanup per code reviews.Nat Goodspeed
Introduce helper classes to manage paired initProfile() / finishProfile() calls and gBenchmarkProgram.bind() / unbind() calls. Make TextureHolder a class instead of a struct. Per Henri Beauchamp, since gpu_benchmark() takes a very early exit if (!gGLManager.mHasTimerQuery), subsequent tests of mHasTimerQuery are redundant. Remove. One of those tests controls the busted_finish bool, which can never become true. Remove that and all tests on it.
2017-11-16MAINT-7977: Release the LLRenderTargets when done.Nat Goodspeed
A classic-C array doesn't destroy its individual elements, but a std::vector does. Use a std::vector<LLRenderTarget> for dest, so each LLRenderTarget will be destroyed. ~LLRenderTarget() calls its release() method.
2017-11-16MAINT-7977: If getVertexStrider() returns false, abandon benchmark.Nat Goodspeed
Ruslan tracked the observed crash to assignments (to create a dummy triangle) through an LLStrider<LLVector3> obtained from getVertexStrider(). When getVertexStrider() returns false, produce a warning and just skip the rest of the benchmark test. The one bit of explicit cleanup apparently required by that early exit is a call to LLImageGL::deleteTextures() to match the preceding generateTextures() call. Wrap both in a new TextureHolder class whose destructor takes care of cleanup. The only other references to the corresponding U32 array are a couple calls to LLTexUnit::bindManual(); add a bind() method to support that. Also fix apparent bug in the LL_DARWIN special case for "improbably high and likely incorrect": the code assigned -1.f (the "couldn't compute" value) to gbps, overlooking the fact that gbps is unconditionally recomputed below. In the "likely incorrect" stanza, simply return -1.f instead.
2017-11-16MAINT-7977 [Alex Ivy] Feature Table crashesruslantproductengine
In case of buff->getVertexStrider(v) return false it mean that glMapBufferRange() return NULL The next three lines can be the reason of this crash.
2017-11-16MAINT-7228 Vertex buffer allocation failure handlingandreykproductengine
2017-11-14MAINT-7228 Dummy triangle should use map instead of offset (in case of VBO)andreykproductengine
2017-11-14MAINT-7228 Vertex buffer allocation failure handlingandreykproductengine
2017-11-07MAINT-7979 Debug info should contain correct stateandreykproductengine
2017-11-07MAINT-7966 Second Life viewer logs session ID in SecondLife.logMnikolenko Productengine
2017-11-03MAINT-7228 Substituted assert with errorandreykproductengine