Commit Graph

38052 Commits (ea90ebff22e87c86c9de0cc6702d29783309ebf9)

Author SHA1 Message Date
Rider Linden ea90ebff22 Figure out later why this block timer suddenly starts crashing. 2017-10-19 14:55:46 -07:00
Rider Linden de622ea576 Put the timer block back in. 2017-10-19 11:24:16 -07:00
Rider Linden c6ae9408aa Fix mac compile unused names in namespace. 2017-10-19 10:03:10 -07:00
Rider Linden ec8e163910 Comment out unused static function for mac 2017-10-17 16:00:07 -07:00
Rider Linden cf74a9438a Merge 2017-10-17 14:40:59 -07:00
Rider Linden 24ed3844af Initial day cycle checkin. 2017-10-17 14:40:21 -07:00
Thomas Nelson 5754493cdc Merged lindenlab/viewer64 into default 2017-10-17 13:38:39 -07:00
Rider Linden 00ce291f01 New prototype control for moving sun and moon in sky. 2017-10-17 12:03:26 -07:00
Rider Linden b4d1b1c43b Removed conversions from WLColor Control in favor of setter/getter 2017-10-16 11:13:45 -07:00
Rider Linden cc22ffc6d7 Watter settings active and start of new joystick button type. 2017-10-13 17:17:49 -07:00
Nat Goodspeed 9c5becd67d Automated merge with ssh://bitbucket.org/lindenlab/viewer64 2017-10-13 13:50:46 -04:00
Nat Goodspeed eafb0a32e3 DRTVWR-418: Remove redundant assignment per Ansariel Hiller. 2017-10-12 08:25:12 -04:00
Nat Goodspeed e80797a5ef MAINT-7081: Update to curl build 501064 2017-10-12 08:13:49 -04:00
Nat Goodspeed 6ab816cc68 DRTVWR-418: Fix glitch from merging from today's viewer-release 2017-10-11 16:50:51 -04:00
Nat Goodspeed 0c7bc67814 Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2017-10-11 14:35:49 -04:00
Oz Linden b6d22de588 increment viewer version to 5.0.9 2017-10-11 09:10:47 -04:00
Oz Linden 4cee904dc3 Added tag 5.0.8-release for changeset 505a492f30bd 2017-10-11 09:10:47 -04:00
Nat Goodspeed 25be14381e MAINT-7831: Update to viewer-manager build 509523 2017-10-10 15:41:37 -04:00
Nat Goodspeed c4c3438e88 MAINT-7831: Merge from tip of https://bitbucket.org/lindenlab/viewer64. 2017-10-09 16:50:50 -04:00
Nat Goodspeed 763a04ced2 MAINT-7831: Update viewer-manager to build 509481. 2017-10-09 16:47:35 -04:00
Nat Goodspeed 9e95301be5 MAINT-7809: Add secondlife.ico to viewer's vmp_icons install dir. 2017-10-09 16:46:22 -04:00
Nat Goodspeed f7fb6b4a0e MAINT-7831: Merge LLManifest.prefix() changes to tip. 2017-10-09 16:39:28 -04:00
Nat Goodspeed be0e3cb250 MAINT-7831: Update viewer_manifest.py to use 'with self.prefix(...):'
Now that LLManifest.prefix() supports use as a context manager:

    with self.prefix(...):
        ...

convert existing calls to that form.

This was an interesting exercise because it surfaced at least two places where
the indentation did not match the self.prefix() nesting, plus another place
where existing code was undented without a self.end_prefix() call. (That last
was an uncaught logic bug.) This underscores the value of using a SINGLE
consistent, idiomatic mechanism to limit the scope of each self.prefix() call.
2017-10-09 16:35:53 -04:00
Nat Goodspeed d9d6df313c MAINT-7831: Allow LLManifest.prefix() to be a context manager.
LLManifest.prefix() dates back to before Python had a 'with' statement or the
notion of a context manager. That's why every prefix() call requires a
corresponding end_prefix() call.

Existing usage is of the form:

    if self.prefix(...some args...):
        self.path(...)
        ...
        self.end_prefix()

The use of an 'if' statement is solely to allow the coder to indent the
statements between the self.prefix() call and the corresponding call to
self.end_prefix() -- there is no intention to make that code conditional.
self.prefix() unconditionally returned True to facilitate that usage.

But now that we have the 'with' statement, this all feels a little silly. Make
prefix() return an instance of a context-manager class so that it's reasonable
to say instead:

    with self.prefix(...some args...):
        self.path(...)
        ...

and have the Right Things happen simply by leaving the 'with' block.

The only tricky part is code to preserve compatibility with old-style usage:

* The context manager has a __nonzero__() method so that if it's tested in an
  'if' statement, it can unconditionally return True.

* On leaving the 'with' block, rather than simply popping the top of each
  prefix stack, the context manager restores its length to the same length it
  had before that prefix() call. This allows for (erroneous but hardly
  unlikely) usage of the form:

    with self.prefix(...some args...):
        self.path(...)
        ...
        self.end_prefix()

Restoring the previous length makes the context manager insensitive to whether
or not end_prefix() has popped the most recent prefix() entries.
2017-10-09 16:28:35 -04:00
Nat Goodspeed 922289264d MAINT-7831: Include secondlife.ico file in the Windows installer. 2017-10-06 14:13:38 -04:00
Nat Goodspeed de59932c29 MAINT-7684: Don't try to package or sign deleted Windows VMP .exes. 2017-10-05 22:54:33 -04:00
Nat Goodspeed a5f7f4fb1d MAINT-7684: Update viewer-manager to codeticket version 509386. 2017-10-05 21:44:31 -04:00
Rider Linden e4b035d0cd Skys settings object active. 2017-10-05 15:40:48 -07:00
Rider Linden e97c52bdd3 Rename uniform "sunlight_color_copy" to sunlight_color in shader. 2017-10-04 14:36:41 -07:00
Nat Goodspeed b508488fc7 MAINT-7831: Update to viewer-manager build 509308 2017-10-04 16:40:33 -04:00
Rider Linden 23916be3da Moon is showing, sun still not working. 2017-09-29 16:46:39 -07:00
Rider Linden b8541cddcc Fix a conversion. 2017-09-27 09:47:12 -07:00
Rider Linden 52b0d4173c No longer 'goth windlight only', sky parameters passed from settings object. 2017-09-27 09:36:26 -07:00
Rider Linden 0d414c1fb5 Clouds still funky but better. 2017-09-26 09:19:20 -07:00
Oz Linden aa62145e1f update VMP to 1.0.508931 2017-09-23 08:25:03 -04:00
Oz Linden 545b03da71 MAINT-7827: suppress doubled notices on various login problems 2017-09-22 15:33:33 -04:00
Oz Linden 02117b8b7b re-add support for a voice connection failure message used by damballah 2017-09-22 14:58:46 -04:00
Oz Linden 3ceeec3afb integrate VMP fixes 2017-09-22 14:56:52 -04:00
Rider Linden 5d3599f5d1 Merge 2017-09-22 09:18:34 -07:00
Oz Linden 38d9454cbf remove redundant exception constructor code, and
generalize exception catching for platform specific code
2017-09-21 19:24:04 -04:00
Rider Linden 150fba7c5c Still not working. Black Sky. 2017-09-21 15:58:13 -07:00
Oz Linden 6ac6826192 Clean up running commands under viewer_manifest (at least a little)
* do not redirect stderr to stdout
* catch errors generated in platform specific code and display them more nicely
* run_command no longer captures output (only used in one place;
  replaced that with direct use of subprocess)
2017-09-21 15:50:29 -04:00
callum_linden b42e2da9df Automated merge with head of viewer64 2017-09-21 14:01:48 -07:00
callum_linden cdba690ec9 Fix for MAINT-7787: [Alex Ivy] RC Viewers in 5.1.0 range show black background for CONTENT_TYPE_HTML. (The color we pass to CEF has 4 compontents red, blue, green and alpha. We were only passing 3 and setting the color and not the alpha. At somepoint in CEF's history the default value must have changed. Passing 0xFF for alpha too - i.e. fully opaque - fixes this) 2017-09-21 14:01:20 -07:00
Rider Linden d4d0520f38 Cleanup inside GLSLShader for uniform mapping. 2017-09-20 14:29:36 -07:00
Nat Goodspeed 1e49cd9b00 DRTVWR-418: Disable more needlessly fragile memory consumption tests. 2017-09-20 17:11:06 -04:00
Nat Goodspeed d1ab470542 DRTVWR-418: Fix C++ errors detected by Xcode 9.
You can't legitimately perform an ordered comparison between a pointer and an
int, even 0. Fix a number of 'if (ptr > 0)' to plain 'if (ptr)'.

Fix LLEditWearableDictionary::WearableEntry constructor to avoid varargs
mechanism. It used to accept three different counts, followed by three
different lists of enums, fetched in each case as 'int' -- dubious in itself.
The constructor body performed three different loops to populate those enums
into three different member vectors.

Instead, make the constructor accept three vectors and initialize the member
vectors from the passed vectors. Now that C++ has inline vector
initialization, change existing constructor calls to pass temporary vectors
initialized with what used to be the varargs enum values.
2017-09-20 16:58:58 -04:00
andreykproductengine 5cd56406ab SL-683 Fixed Logging parameters not taking effect immediately 2017-09-20 15:53:34 +03:00
Rider Linden c04ceedbc3 Baseline for settings changes 2017-09-19 15:50:30 -07:00
Nat Goodspeed eae144219c DRTVWR-418: Another attempt to generate Mac debug symbols.
The viewer's 00-COMPILE-LINK-RUN.txt recommends passing -gdwarf-2 to the Mac
compiler, and so we've been doing ever since before the viewer-build-variables
repo was engaged. Now we discover that when CMake sees -gdwarf-2, it removes
the -g switch entirely. It also removes it when you pass plain -g. Only when
you pass -gdwarf-with-dsym or just -gdwarf does CMake pass plain -g to the
compiler. Change -gdwarf-2, if specified, to -gdwarf so we at least get -g.
2017-09-19 15:35:08 -04:00