summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2017-07-19merge from viewer64-vmp-integrationGlenn Glazer
2017-07-18do not persist SkipBenchmark so that changing gpu gets a new evalOz Linden
2017-07-13add SkipBenchmark settingOz Linden
2017-07-12Fixes for: 'MAINT-7588 Viewer takes 3 to 5 seconds to load TOS and styling ↵Callum Prentice
different on redirecting page' and 'MAINT-7599 Reformat ToS 'Accept' label as a single string'. The former's load time is improved by only asking for the HTTP header to check site is alive and then applying a specific CSS style to the page instead of relying on the CEF default (which appears to change often). The latter replaces the XUI checkbox label with a text box and adjusts it visually as necessary for enabled/disabled states
2017-07-12add logging for skipping benchmark (and fixed some log tags)Oz Linden
2017-07-11merge changes for MAINT-7592Oz Linden
2017-07-11MAINT-7592 (update): fix ToS cancel alert and leftover xml comment terminatorOz Linden
2017-07-11merge latest VMP updatesOz Linden
2017-07-11merge changes for MAINT-7592Oz Linden
2017-07-11merge changes for MAINT-7592Oz Linden
2017-07-11merge floater TOS changeGlenn Glazer
2017-07-11MAINT-7592: Update ToS agreement floaterOz Linden
2017-07-11MAINT-7581 [contribution] Closing the 'Replace links' floater crashes the ↵Mnikolenko Productengine
viewer if a replace is in progress
2017-07-25MAINT-7356 Improved the notification appearanceAndreyL ProductEngine
2017-07-21MAINT-7356 Logic fix and cleanupAndreyL ProductEngine
2017-07-18MAINT-7607 FIXED Viewer crashes when double clicking on scroll bar arrow in ↵Mnikolenko Productengine
Outfit Gallery tab
2017-07-12Merged in oz_linden/maint-7592AndreyL ProductEngine
2017-07-11Merged in oz_linden/maint-7592AndreyL ProductEngine
2017-07-10MAINT-4532: properly detect Windows 10 in the 64bit build (only - 32bit runs ↵Oz Linden
in Windows 8 compatibility mode)
2017-07-10Remove FAS from cmd_line.xmlGlenn Glazer
2017-07-07mergeGlenn Glazer
2017-07-07MAINT-7571: detect if all HD cards are bad and addr is forced to 64, then ↵Glenn Glazer
stay at 64 bit
2017-07-06fix missing declarationGlenn Glazer
2017-07-06upgrade to VMP package 507104Glenn Glazer
2017-06-30SL-671: uninstall pinning changesGlenn Glazer
2017-06-30MAINT-7442: remove old skool check for updatesGlenn Glazer
2017-06-28DRTVWR-418: Merge SL-739 and MAINT-7515 fix into viewer64.Nat Goodspeed
2017-06-28DRTVWR-418: Bump TEXTURE_CACHE_VERSION and INDRA_OBJECT_CACHE_VERSIONNat Goodspeed
so the Alex Ivy viewer will reset caches. We have some evidence that the cache content is tied to ADDRESS_SIZE, so asking a 64-bit viewer to process 32-bit cache content is problematic.
2017-06-27mergecoyot
2017-06-27use icon in viewer exe for shortcutcoyot
2017-06-27upgrade to VMP package 506923Glenn Glazer
2017-06-27Try pointing icon path to actual viewer exeGlenn Glazer
2017-06-26MAINT-7514: remove check if same version is installedGlenn Glazer
2017-06-26mergeGlenn 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-23MAINT-7515: point shortcut icon at viewer exeGlenn 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-20MAINT-7507 FIXED When assigning abilities to a group role, ticking "Manage ↵Mnikolenko Productengine
ban list" causes other selected abilities to untick
2017-06-19update viewer-manager, primarily to solve Mac packaging problemOz Linden
2017-06-16remove redundant slash from update service base url (cosmetic)Oz Linden
2017-06-16MAINT-7505: correct packaging of python llbaseOz Linden
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-14MAINT-7489 FIXED Viewer may silently empty trash without the users request ↵Mnikolenko Productengine
under obscure inventory folder states
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-31 01:19:17 +0000