summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2017-10-11DRTVWR-418: Fix glitch from merging from today's viewer-releaseNat Goodspeed
2017-10-11Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2017-10-11increment viewer version to 5.0.9Oz Linden
2017-10-09MAINT-7831: Merge from tip of https://bitbucket.org/lindenlab/viewer64.Nat Goodspeed
2017-10-09MAINT-7809: Add secondlife.ico to viewer's vmp_icons install dir.Nat Goodspeed
2017-10-09MAINT-7831: Update viewer_manifest.py to use 'with self.prefix(...):'Nat Goodspeed
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-09MAINT-7831: Allow LLManifest.prefix() to be a context manager.Nat Goodspeed
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-05MAINT-7684: Don't try to package or sign deleted Windows VMP .exes.Nat Goodspeed
2017-09-22MAINT-7827: suppress doubled notices on various login problemsOz Linden
2017-09-22re-add support for a voice connection failure message used by damballahOz Linden
2017-09-21remove redundant exception constructor code, andOz Linden
generalize exception catching for platform specific code
2017-09-21Clean up running commands under viewer_manifest (at least a little)Oz Linden
* 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-21Automated merge with head of viewer64callum_linden
2017-09-21Fix for MAINT-7787: [Alex Ivy] RC Viewers in 5.1.0 range show black ↵callum_linden
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-20DRTVWR-418: Disable more needlessly fragile memory consumption tests.Nat Goodspeed
2017-09-20DRTVWR-418: Fix C++ errors detected by Xcode 9.Nat Goodspeed
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-20SL-683 Fixed Logging parameters not taking effect immediatelyandreykproductengine
2017-09-19DRTVWR-418: Another attempt to generate Mac debug symbols.Nat Goodspeed
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-19MAINT-7820 Fixed crash in LLEventPumpandreykproductengine
2017-09-18MAINT-7813 - 3D rendering broken on Windows in build 508618. 3D rendering ↵ruslantproductengine
starts before 2D login screen is cleared. FIXED
2017-09-15merge CEF fixes from callumOz Linden
2017-09-15additional logging to help with MAINT 7807Oz Linden
2017-09-15add address size to build_data.json so that SL_Launcher can log itOz Linden
2017-09-14replace a 'continue' with an 'else'Oz Linden
2017-09-14merge changes for MAINT-7129Oz Linden
2017-09-14MAINT-7129 - [Project Alex Ivy][MAC] Materials and ALM shaders broken in Mac ↵ruslantproductengine
viewer FIXED
2017-09-14Merged in lindenlab/viewer-bearAndreyL ProductEngine
2017-09-13MAINT-7446 Fixed After installs, bat file fails to start the viewer.andreykproductengine
2017-09-13MAINT-7794 Wrap getCapability(..) calls to avoid crashesMnikolenko Productengine
2017-09-12MAINT-7786 FIXED Crash in LLVivoxVoiceClient::provisionVoiceAccount()Mnikolenko Productengine
2017-09-08mark some settings no longer used by update as obsoleteOz Linden
2017-09-08MAINT-7772: make update mode three choices: automatic, ask, and mandatory onlyOz Linden
2017-09-08MAINT-7783 FIXED Outfit gallery panel is opened briefly when you are ↵Mnikolenko Productengine
quitting viewer
2017-09-07Merged lindenlab/viewer-neko into defaultAndrey Lihatskiy
2017-09-07MAINT-2047 FIXED Avatar follows the object only once if change object's ↵Mnikolenko Productengine
location in Edit mode
2017-09-07Merged in MAINT-5013Andrey Kleshchev
Approved-by: Simon Linden <simon@lindenlab.com> Approved-by: Andrey Lihatskiy <andreylproductengine@lindenlab.com> Approved-by: Andrey Kleshchev <andreykproductengine@lindenlab.com>
2017-09-07mac and linux build fixMnikolenko Productengine
2017-09-07MAINT-7768 FIXED Unable to get Choose to work in Abuse Report means unable ↵Mnikolenko Productengine
to file AR
2017-09-06MAINT-7691 Fixed crash report not generating files in unicode named foldersandreykproductengine
2017-09-06Backed out changeset: ab07c3c8d1ea (MAINT-5013)andreykproductengine
2017-09-05MAINT-5013 Fixed Changing avatar sex while sitting breaks animations until ↵daianakproductengine
relogging
2017-09-05MAINT-7753 remove the warning for marketplace listingsMnikolenko Productengine
2017-09-04Merged in MAINT-7326Andrey Kleshchev
Approved-by: Maxim Nikolenko <maximnproductengine@lindenlab.com> Approved-by: Andrey Lihatskiy <andreylproductengine@lindenlab.com> Approved-by: Simon Linden <simon@lindenlab.com>
2017-09-04MAINT-7745 FIXED After editing an outfit, duplicate photos appear in the ↵Mnikolenko Productengine
Outfit Gallery for outfits that previously had no photo.
2017-09-01Hopeful fix for MAINT-7654 Ivy] Japanese can't input in CEFcallum_linden
2017-09-01MAINT-7649 Error with information in case of failed allocation.andreykproductengine
2017-09-01MAINT-7326 Cache value fix for non-default languagesandreykproductengine
2017-08-31MAINT-7691 Crashreported sometimes not starting from unicode named foldersandreykproductengine
2017-08-31MAINT-7761 FIXED Inventory UUID search does not exclude assets that are ↵Mnikolenko Productengine
limited perms.
2017-08-31MAINT-7554 Fixed missing descriptionandreykproductengine