Commit Graph

40429 Commits (bd008a170898e69beeb8bc0481b4bfd94de86c55)

Author SHA1 Message Date
Mnikolenko Productengine 4bcaac489e MAINT-7565 FIXED Inconsistent name format in nearby chat toast and chat history 2017-07-10 15:47:26 +03:00
Glenn Glazer 5c1d9d65f6 fix missing declaration 2017-07-06 16:09:44 -07:00
Glenn Glazer 42a8dbbd16 upgrade to VMP package 507104 2017-07-06 15:44:13 -07:00
Glenn Glazer 61f3366eec upgrade to VMP package 507087 2017-07-06 11:53:03 -07:00
Brad Payne (Vir Linden) 59976ece36 SL-722 - crash fix when leaving region 2017-07-06 18:50:54 +01:00
Brad Payne (Vir Linden) f55667397e SL-722 - handle per-object animation requests, combine for control avatar animation state. 2017-07-06 01:25:10 +01:00
andreykproductengine f7f24611c6 MAINT-203 Fixed auto-scroll zones being uneven in inventory 2017-07-05 19:34:04 +03:00
andreykproductengine c8fc414ebe MAINT-7329 Viewer was spamming log with motion limit messages 2017-07-04 16:25:41 +03:00
Brad Payne (Vir Linden) 2af5332e46 Added cycle_object_animations.lsl. Also change to test.cpp to see if it affects a g++ internal compiler error. 2017-06-30 21:59:39 +01:00
Brad Payne (Vir Linden) a09cc5f4bb SL-731 - added a hook for debug text specific to control avatars. Also renamed resetJointsOnDetach to removeAttachmentOverridesForObject to make the connection to addAttachmentOverridesForObject more obvious. 2017-06-30 20:49:23 +01:00
Glenn Glazer 5fd1c47bb4 SL-671: uninstall pinning changes 2017-06-30 08:21:29 -07:00
Glenn Glazer a12ba66924 MAINT-7442: remove old skool check for updates 2017-06-30 08:12:03 -07:00
Nat Goodspeed 7eb53d4ccb Automated merge with ssh://bitbucket.org/lindenlab/viewer64-vmp-integration 2017-06-29 12:06:30 -04:00
Glenn Glazer b660325546 upgrade to VMP package 507000 2017-06-29 08:00:21 -07:00
Brad Payne (Vir Linden) 999b0b47b5 SL-722 - crash fix 2017-06-29 14:15:58 +01:00
Nat Goodspeed 621db1ddd1 DRTVWR-418: Merge SL-739 and MAINT-7515 fix into viewer64. 2017-06-28 21:02:01 -04:00
Glenn Glazer 8736605b65 merge 2017-06-28 14:51:44 -07:00
Brad Payne (Vir Linden) c2280848e1 SL-722 - work on support for animated object state when linkset-altering operations take place 2017-06-28 22:17:28 +01:00
Glenn Glazer 240239142b upgrade to VMP package 506977 2017-06-28 14:11:01 -07:00
Nat Goodspeed ab1255c416 DRTVWR-418: Bump TEXTURE_CACHE_VERSION and INDRA_OBJECT_CACHE_VERSION
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-28 10:50:52 -04:00
coyot deaca27155 merge 2017-06-27 13:33:08 -07:00
coyot 6eae3c6f4f use icon in viewer exe for shortcut 2017-06-27 13:32:34 -07:00
Brad Payne (Vir Linden) 0b57379b12 SL-722 - animated mesh checkbox inactive unless there's a single object or linkset, all volumes 2017-06-27 20:52:02 +01:00
andreykproductengine d80981de76 MAINT-7554 Frame throttling 2017-06-27 22:51:39 +03:00
Brad Payne (Vir Linden) 7af46e7fe3 SL-722 - defer markDead() for LLControlAvatar when unlinking. Fixes asset crash in pipeline. Also added various checks for mDrawable null in llvoavatar.cpp. 2017-06-27 20:24:15 +01:00
Glenn Glazer 3fd2ac14ea upgrade to VMP package 506923 2017-06-27 12:20:55 -07:00
Glenn Glazer cc85030f7e Try pointing icon path to actual viewer exe 2017-06-27 07:57:04 -07:00
Brad Payne (Vir Linden) b6aedb116f SL-722 - in progress on managing animated object state with linksets 2017-06-27 14:15:42 +01:00
Glenn Glazer 263a9e7791 MAINT-7514: remove check if same version is installed 2017-06-26 13:11:20 -07:00
Glenn Glazer 1c148b5bc0 merge 2017-06-26 10:02:07 -07:00
Nat Goodspeed c45c51fa9b Automated merge with ssh://bitbucket.org/nat_linden/viewer64-maint-7514 2017-06-26 12:58:29 -04:00
Nat Goodspeed be9a9c82a0 DRTVWR-418: Merge viewer64-vmp-integration into viewer64. 2017-06-26 12:58:01 -04:00
Glenn Glazer 74afc93a49 upgrade to VMP package 506854 2017-06-26 07:17:02 -07:00
Nat Goodspeed 924414d65e MAINT-7514: Fetch needed env vars in WindowsManifest.sign() method. 2017-06-26 10:04:57 -04:00
Nat Goodspeed b3c506bc68 MAINT-7514: Add (32) or (64) to registry for "install again?" prompt.
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-26 09:15:01 -04:00
Glenn Glazer d6bd3cbcf1 merge from gate 2017-06-23 09:50:11 -07:00
Glenn Glazer faf237e60c MAINT-7515: point shortcut icon at viewer exe 2017-06-23 09:49:09 -07:00
Glenn Glazer 6bcbee3328 upgrade to VMP package 506825 2017-06-22 16:24:31 -07:00
Nat Goodspeed 58f62e2883 DRTVWR-418: Update to curl build 506810 2017-06-22 14:13:42 -04:00
Glenn Glazer 2a24defdd0 upgrade to VMP package 506766 2017-06-21 15:37:15 -07:00
Brad Payne (Vir Linden) 3c8ff04c0f SL-722 - animated object checkbox is based on state of root prim. Enabled only when root prim or whole linkset is being edited. 2017-06-21 15:25:50 +01:00
Glenn Glazer d09bebe323 upgrade to VMP package 506741 2017-06-20 14:32:50 -07:00
Brad Payne (Vir Linden) 4d29b95fb5 merge 2017-06-20 22:11:41 +01:00
Oz Linden 8ee8778347 merge changes for MAINT-7466 2017-06-20 17:07:27 -04:00
Oz Linden d8be66c8e2 merge changes for 5.0.6-release 2017-06-20 17:05:53 -04:00
Oz Linden 347015be33 fix presentation of log tags for better searchability 2017-06-20 17:03:20 -04:00
Glenn Glazer 1054ddf1ba pull from v64 gate 2017-06-20 13:46:51 -07:00
AndreyL ProductEngine e553e6feb2 Merged in lindenlab/viewer-lynx 2017-06-20 23:20:30 +03:00
AndreyL ProductEngine 270cd8ff15 Merged in lindenlab/viewer-release 2017-06-20 23:16:03 +03:00
Nat Goodspeed a3066b7375 Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2017-06-20 16:11:33 -04:00