summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2017-04-28SL-671: fix string substitutioncoyot@coyot-sager-PC
2017-04-28SL-671: make icon point to launcher, not viewercoyot@coyot-sager-PC
2017-04-17SL-617: alter viewer manifest to write exe name to summary.json, upgrade VMP ↵Glenn Glazer
package to 504292 to read it
2017-04-11MAINT-6928: revert previous post-move strategy, rename via self.path insteadGlenn Glazer
2017-04-11MAINT-6928: guard shutil.move against retryGlenn Glazer
2017-04-11MAINT-6928: os,rename is retarded, use shutil.move insteadGlenn Glazer
2017-04-11MAINT-6928: upgrade to VMP package 504140, use renamed directory to walk ↵Glenn Glazer
around codesign bug; fix dullahan file copy code
2017-04-10MAINT-6928: Add in Python 2.6.6 modulesGlenn Glazer
2017-04-07MAINT-7282: add requests module and associated build machineryGlenn Glazer
2017-04-06pull from gateGlenn Glazer
2017-04-05MAINT-6928: update VMP package 503733, add requests package 504010, ↵Glenn Glazer
associated viewer-manifest changes for new files
2017-03-31SL-321: sign *before* nsis grabs the EXEsGlenn Glazer
2017-03-30DRTVWR-418: Eliminate reference to LLParcelSelection::sNullSelection.Nat Goodspeed
2017-03-30DRTVWR-418: Xcode 8.3 complains about LLSafeHandle<T> implementation.Nat Goodspeed
The previous LLSafeHandle<T> implementation declares a static data member of the template class but provides no (generic) definition, relying on particular specializations to provide the definition. The data member is a function pointer, which is called in one of the methods to produce a pointer to a "null" T instance: that is, a dummy instance to be dereferenced in case the wrapped T* is null. Xcode 8.3's version of clang is bothered by the call, in a generic method, through this (usually) uninitialized pointer. It happens that the only specializations of LLSafeHandle do both provide definitions. I don't know whether that's formally valid C++03 or not; but I agree with the compiler: I don't like it. Instead of declaring a public static function pointer which each specialization is required to define, add a protected static method to the template class. This protected static method simply returns a pointer to a function-static T instance. This is functionally similar to a static LLPointer<T> set on demand (as in the two specializations), including lazy instantiation. Unlike the previous implementation, this approach prohibits a given specialization from customizing the "null" instance function. Although there exist reasonable ways to support that (e.g. a related traits template), I decided not to complicate the LLSafeHandle implementation to make it more generally useful. I don't really approve of LLSafeHandle, and don't want to see it proliferate. It's not clear that unconditionally dereferencing LLSafeHandle<T> is in any way better than conditionally dereferencing LLPointer<T>. It doesn't even skip the runtime conditional test; it simply obscures it. (There exist hints in the code that at one time it might have immediately replaced any wrapped null pointer value with the pointer to the "null" instance, obviating the test at dereference time, but this is not the current functionality. Perhaps it was only ever wishful thinking.) Remove the corresponding functions and static LLPointers from the two classes that use LLSafeHandle.
2017-03-16merge CEF update and fixes from callumOz Linden
2017-03-15Next part of the 'SL-641 Update CEF -> cef-bin -> Dullahan -> ↵callum@lindenlab.com
p64_3p-Dullahan -> media_plugin_cef.cpp to current latest version' puzzle - fix @rpath/@executable paths for macOS
2017-03-14SL-641 - Update CEF -> cef-bin -> Dullahan -> p64_3p-Dullahan -> ↵Callum Prentice
media_plugin_cef.cpp to latest versionPull in p64_3p-dullahan that has the cef 2897/chrome 57
2017-03-14Tweak CEF plugin version to include Chrome equivalentCallum Prentice
2017-03-13Automated merge with ssh://bitbucket.org/lindenlab/viewer64Nat Goodspeed
2017-03-13Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2017-03-13Automated merge with tip of viewer-releaseCallum Prentice
2017-03-13increment viewer version to 5.0.4Oz Linden
2017-03-13Automated merge with ssh://bitbucket.org/lindenlab/viewer64-maint-7177Nat Goodspeed
2017-03-13DRTVWR-418: Tweak shutdown sequence to avoid resurrecting singletons.Nat Goodspeed
The LLSingletonBase::deleteAll() call late in LLAppViewer::cleanup() deletes the LLSingleton(s) used by the logging machinery, among other things. Attempting further logging after that call (such as our cheery "Goodbye!") has the unfortunate effect of attempting to resurrect the deleted LLSingleton(s). Move "Goodbye!" to just *before* the call. Also, given that call, the manual references to a couple specific LLSingletons in ~LLAppViewer() are (a) unnecessary and (b) cause attempted resurrection. Eliminate both.
2017-03-12MAINT-6998 [Project Alex Ivy] 64bit viewer installs to Program Files (x86) ↵Callum Prentice
by default. (Update2: evidently the registry set call is needed on un.init() too
2017-03-11MAINT-6998 [Project Alex Ivy] 64bit viewer installs to Program Files (x86) ↵Callum Prentice
by default. (Update: call to select registry needs to be inside a function)
2017-03-11Update: (thanks Drake) MAINT-6998 [Project Alex Ivy] 64bit viewer installs ↵callum@lindenlab.com
to Program Files (x86) by default. Added option to engage 32 or 64 bit registry
2017-03-10MAINT-6998 [Project Alex Ivy] 64bit viewer installs to Program Files (x86) ↵Callum Prentice
by default.
2017-03-10Fix for MAINT-7047 No information about 32bit or 64bit version of 'Project ↵Callum Prentice
Alex Ivy' viewer in non-English locales
2017-03-08Second Life SL-643 viewer_manifest.py still tried to copy the CEF file ↵callum@lindenlab.com
wow_helper.exe but it's no longer present
2017-03-08merge changes for MAINT-7156Oz Linden
2017-03-06Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2017-03-06increment viewer version to 5.0.3Oz Linden
2017-03-01MAINT-7161 Crash in LLViewerInventoryItemandreykproductengine
2017-02-24First round of changes to make the macOS 64 build workcallum@lindenlab.com
2017-02-24MAINT-7156: do not use the server-supplied agent email when sending a ↵Oz Linden
postcard because it is obfuscated and not needed
2017-02-22Use new version info from CEF plugin to display in About boxCallum Prentice
2017-02-21First round of changes to replace LLCEFLib with Dullahan. Mostly Windows ↵Callum Prentice
changes in this batch since I'm working on Windows box but some speculative macOS ones too although they are quite untested
2017-02-17Automated merge with head of lindenlab/callum_viewer64callum@lindenlab.com
2017-02-15improve dependency declarations for packages-info and other settings filesOz Linden
2017-02-13Automated merge with head of callum_linden/viewer64-xcode8callum@lindenlab.com
2017-02-13Automated merge with head of callum_linden/viewer64-callumcallum@lindenlab.com
2017-02-13MAINT-6999 Cap attachment render weightandreykproductengine
2017-02-10Merged in lindenlab/viewer-bearAndreyL ProductEngine
2017-02-09MAINT-7095 Fixed Detached and reduced nearby chat floater does not maintain ↵andreykproductengine
its position through viewer restart.
2017-02-06MAINT-2001 Fixes colums misbeheavingandreykproductengine
2017-02-03Automated merge with ssh://bitbucket.org/lindenlab/viewer64Nat Goodspeed
2017-02-03Change destination location of updated VLC files to correct onecallum@lindenlab.com
2017-02-03MAINT-6959: Use localized category namesAnsariel Hiller
2017-02-03MAINT-2438 Fixes wrong permissions sourceandreykproductengine