summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-06-26DRTVWR-418: Merge viewer64-vmp-integration into viewer64.Nat Goodspeed
2017-06-26upgrade to VMP package 506854Glenn Glazer
2017-06-26MAINT-7514: Fetch needed env vars in WindowsManifest.sign() method.Nat Goodspeed
2017-06-26MAINT-7514: Add (32) or (64) to registry for "install again?" prompt.Nat Goodspeed
Specifically, append (32) or (64) to the four-part version number stored in the registry entry used to detect whether this viewer has already been installed. This is injected as a new VERSION_REGISTRY NSIS variable. (It was tempting to simply change the value of VERSION_LONG with the embedded address size. However, there is one other use of VERSION_LONG in the NSIS template. That use is the subject of MAINT-7533.) Synthesize the VERSION_REGISTRY value in viewer_manifest.py and add it to the substitution dict used to populate the NSIS template. ADDRESS_SIZE isn't passed into viewer_manifest.py, but it can be inferred from the existing 'arch' parameter: 'arch' as well as 'platform' is used to select the specific subclass of the ViewerManifest class to instantiate for this run. Add an appropriate address_size attribute to every such subclass. Change a couple existing tests on 'arch' to tests on self.address_size instead -- clearer to the maintainer. Also, given that subclass selection mechanism, the ViewerManifest base class shouldn't need if / elif tests on 'platform'. Make build_data_json_platform a class attribute as well, removing the base-class stanza that dynamically examines 'platform' and 'arch'. Similarly, move platform-specific tweaks to the build_data_dict used to populate build_data.json into a new finish_build_data_dict() method overridden by individual platform subclasses. Encapsulate the logic around running the Windows code-signing tool into a sign() method, and call it as needed. For obtaining environment variables with fallback values, use os.environ.get() instead of os.path.expandvars() with tests on the returned value.
2017-06-23merge from gateGlenn Glazer
2017-06-23MAINT-7515: point shortcut icon at viewer exeGlenn Glazer
2017-06-22upgrade to VMP package 506825Glenn Glazer
2017-06-22DRTVWR-418: Update to curl build 506810Nat Goodspeed
2017-06-21upgrade to VMP package 506766Glenn Glazer
2017-06-20upgrade to VMP package 506741Glenn Glazer
2017-06-20pull from v64 gateGlenn Glazer
2017-06-20Merged in lindenlab/viewer-lynxAndreyL ProductEngine
2017-06-20Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2017-06-20Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2017-06-20increment viewer version to 5.0.7Oz Linden
2017-06-20Added tag 5.0.6-release for changeset 3e5035dfd8afOz Linden
2017-06-20mergeGlenn Glazer
2017-06-20upgrade to VMP package 506528Glenn Glazer
2017-06-20MAINT-7507 FIXED When assigning abilities to a group role, ticking "Manage ↵Mnikolenko Productengine
ban list" causes other selected abilities to untick
2017-06-20merge CEF updateOz Linden
2017-06-19update viewer-manager, primarily to solve Mac packaging problemOz Linden
2017-06-16remove dependency on urllib3 in viewer-managerOz Linden
2017-06-16update viewer-manager to fix problem with finding the ca-bundleOz Linden
2017-06-16remove redundant slash from update service base url (cosmetic)Oz Linden
2017-06-16MAINT-1614 Fixed Object changed its position inworld but value in Edit tool ↵andreykproductengine
was not changed
2017-06-16MAINT-7488 FIXED [Windows] Viewer crashes when pasting empty string from ↵Mnikolenko Productengine
clipboard
2017-06-16MAINT-7505: correct packaging of python llbaseOz Linden
2017-06-15SL-700: upgrade to VMP package 506528Glenn Glazer
2017-06-15MAINT-7483 Fixed inability to drag a folder into object contentsandreykproductengine
2017-06-14SL-700: temporarily use local version of ca-bundle.crt, remove ca-bundle ↵Glenn Glazer
copy calls from viewer manifest
2017-06-14SL-700: temporarily use local version of ca-bundle.crt instead of from ↵Glenn Glazer
voice, misc cleanup
2017-06-14Merged in lindenlab/viewer-lynxAndreyL ProductEngine
2017-06-14mergeBrad Payne (Vir Linden)
2017-06-14MAINT-7489 FIXED Viewer may silently empty trash without the users request ↵Mnikolenko Productengine
under obscure inventory folder states
2017-06-13upgrade to vmp package 506464Glenn Glazer
2017-06-13upgrade to vmp package 506452Glenn Glazer
2017-06-13SL-700: synchronize viewer and vmp llbase platformsGlenn Glazer
2017-06-13MAINT-7491 FIXED "Remove from current outfit" option is missing for all ↵Mnikolenko Productengine
system folders including COF
2017-06-12MAINT-7192: upgrade to W64 viewer to llbase 506431Glenn Glazer
2017-06-12MAINT-7192: upgrade to viewer to vmp package 506422Glenn Glazer
2017-06-12MAINT-7192: upgrade to viewer to llbase 506286Glenn Glazer
2017-06-12MAINT-7192: upgrade to VMP package 506412Glenn Glazer
2017-06-12MAINT-7325 Fixed empty cached image being used instead of fetchingandreykproductengine
2017-06-12MAINT-7478 Build fix, boost function doesn't like 'reuse' of cb_do_nothingandreykproductengine
2017-06-12Fixed line endings for llpngwrapper.cppandreykproductengine
2017-06-09MAINT-7478 Fixed "No callback" log spamandreykproductengine
2017-06-10Merged in MAINT-321Andrey Kleshchev
2017-06-09FIX MAINT-7456 Corrected translation errors in Russian and Spanish.eli
2017-06-09MAINT-7482 - continue running with a warning on receipt of unknown messageBrad Payne (Vir Linden)
2017-06-08Automated merge with head of callum_linden/viewer64 that pulls in the latest ↵Callum Prentice
version of p64_3p-dullahan version 3.3021 (Like Chrome 59)