summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2017-04-05Fix for MAINT-7227 Drop down lists do not close after use in internal web ↵Callum Prentice
browser. (Surprisingly large amount of changes and new version of Dullahan to support this fix)
2017-04-03Automated merge with ssh://bitbucket.org/lindenlab/viewer64Nat Goodspeed
2017-03-30 fix for MAINT-6998 64bit viewer installs to Program Files (x86) by default. ↵Callum Prentice
- this change also fixes MAINT-5365 Windows viewer uninstall icon is system default not SL logo
2017-03-31Merged in lindenlab/viewer-lynxAndreyL ProductEngine
2017-03-30DRTVWR-418: Eliminate reference to LLParcelSelection::sNullSelection.Nat Goodspeed
2017-03-30DRTVWR-418: Xcode 8.3 complains about LLSafeHandle<T> implementation.Nat Goodspeed
The previous LLSafeHandle<T> implementation declares a static data member of the template class but provides no (generic) definition, relying on particular specializations to provide the definition. The data member is a function pointer, which is called in one of the methods to produce a pointer to a "null" T instance: that is, a dummy instance to be dereferenced in case the wrapped T* is null. Xcode 8.3's version of clang is bothered by the call, in a generic method, through this (usually) uninitialized pointer. It happens that the only specializations of LLSafeHandle do both provide definitions. I don't know whether that's formally valid C++03 or not; but I agree with the compiler: I don't like it. Instead of declaring a public static function pointer which each specialization is required to define, add a protected static method to the template class. This protected static method simply returns a pointer to a function-static T instance. This is functionally similar to a static LLPointer<T> set on demand (as in the two specializations), including lazy instantiation. Unlike the previous implementation, this approach prohibits a given specialization from customizing the "null" instance function. Although there exist reasonable ways to support that (e.g. a related traits template), I decided not to complicate the LLSafeHandle implementation to make it more generally useful. I don't really approve of LLSafeHandle, and don't want to see it proliferate. It's not clear that unconditionally dereferencing LLSafeHandle<T> is in any way better than conditionally dereferencing LLPointer<T>. It doesn't even skip the runtime conditional test; it simply obscures it. (There exist hints in the code that at one time it might have immediately replaced any wrapped null pointer value with the pointer to the "null" instance, obviating the test at dereference time, but this is not the current functionality. Perhaps it was only ever wishful thinking.) Remove the corresponding functions and static LLPointers from the two classes that use LLSafeHandle.
2017-03-30Add multiline support for MAINT-6959andreykproductengine
2017-03-30MAINT-7245 Use Experience Box in LSL Editor will not show as checked if ↵Mnikolenko Productengine
containing object is in another region
2017-03-30MAINT-7128 Crash in LLDrawable::cleanupReferences - more informative loggingAndreyL ProductEngine
2017-03-29DRTVWR-418: Instead of "Unknown", try be informative about platform.Nat Goodspeed
When a 'family' code isn't recognized, for instance, report the family code. That should at least clue us in to look up and add an entry for the relevant family code.
2017-03-29Merged in lindenlab/viewer-lynxAndreyL ProductEngine
2017-03-28MAINT-7257 Added null check for volume managerandreykproductengine
2017-03-28MAINT-1858 Fixed camera not looking at avatar if "Editing Appearance" while ↵andreykproductengine
moving
2017-03-28Backed out changeset: 50e72280019fandreykproductengine
2017-03-28MAINT-6980 FIXED Ctrl + Alt + Shift + B does not force a crash on macMnikolenko Productengine
2017-03-27Fix for MAINT-7131 Unable to start the x64 Viewer on Windows 8.1 x64. This ↵Callum Prentice
appears to be because two of the MS DLLs we ship with the 64 bit viewer are 32bit. Manually replacing them with their 64 bit equivalents allowed the viewer to start on Windows 8.1. The change forces the cmake file which copies the DLLs to look in C:\windows\SysWOW64 for 32 bit versions and C:\windows\system32 for 64 bit versions. (yes really).
2017-03-27Additional work on : Fix for MAINT-7054 Viewer Crashed when I used Japanese ↵Callum Prentice
IM. (Drake and Appurist convinced me my initial solution was non-optimal)
2017-03-27Fix for MAINT-7054 Viewer Crashed when I used Japanese IM.Callum Prentice
2017-03-27MAINT-7238 Change InventoryMarketplaceError textMnikolenko Productengine
2017-03-24MAINT-380 Add "Duplicate" feature into Build-Object sunbmenuandreykproductengine
2017-03-23MAINT-7237 Change Flickr upload button label & window title nameMnikolenko Productengine
2017-03-22MAINT-6789 MAC build fixandreykproductengine
2017-03-22MAINT-7225 Blocks list wasn't updating corretly for name based muting.andreykproductengine
2017-03-22Merged in lindenlab/viewer-lynxAndreyL ProductEngine
2017-03-21MAINT-7224 Chat logs move down, leaving huge empty spaceMnikolenko Productengine
2017-03-20Automated merge with ssh://bitbucket.org/lindenlab/viewer64Nat Goodspeed
2017-03-21MAINT-6789 Add More now won't affect Edit Appearance perfomance during fetch ↵andreykproductengine
unless visible
2017-03-22MAINT-7225 MAC build fixandreykproductengine
2017-03-22MAINT-6404 FIXED When pasting from Mac Word into a notecard, line break is ↵Mnikolenko Productengine
replaced by ?
2017-03-20MAINT-7223 Odd placement on box in chat preferencesMnikolenko Productengine
2017-03-20MAINT-7117 Don't Show "Unknown error" in warning dialogMnikolenko Productengine
2017-03-16merge CEF update and fixes from callumOz Linden
2017-03-16MAINT-1858 Fixed camera not looking at avatar if "Editing Appearance" while ↵andreykproductengine
moving
2017-03-17MAINT-7215 Add "+" button next to filter editor in Avatar rendering settings ↵Mnikolenko Productengine
floater
2017-03-16MAINT-7208 Some messages had links that were not highlightedandreykproductengine
2017-03-15Next part of the 'SL-641 Update CEF -> cef-bin -> Dullahan -> ↵callum@lindenlab.com
p64_3p-Dullahan -> media_plugin_cef.cpp to current latest version' puzzle - fix @rpath/@executable paths for macOS
2017-03-15Merged in MAINT-7168max nikolenko
2017-03-15MAINT-7199 Field "From" on the tab "Send via E-mail" should be initialized ↵Mnikolenko Productengine
to the agent full name
2017-03-15MAINT-7168 Avatar rendering settings adjustmentsMnikolenko Productengine
2017-03-15MAINT-7206 Fixed crash on doubleclick deselecting last mute type from the ↵AndreyL ProductEngine
context menu
2017-03-14Fixed for MAINT-7201, MAINT-7202, MAINT-7203 (viewer-embeddedd browser ↵Callum Prentice
scheme handler was broken)
2017-03-14SL-641 - Update CEF -> cef-bin -> Dullahan -> p64_3p-Dullahan -> ↵Callum Prentice
media_plugin_cef.cpp to latest versionPull in p64_3p-dullahan that has the cef 2897/chrome 57
2017-03-14Tweak CEF plugin version to include Chrome equivalentCallum Prentice
2017-03-14MAINT-1800 Menu item appears at the top of the screen during teleportingandreykproductengine
2017-03-14Automated merge with ssh://bitbucket.org/lindenlab/viewer64Nat Goodspeed
2017-03-13Automated merge with ssh://bitbucket.org/lindenlab/viewer64Nat Goodspeed
2017-03-13Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2017-03-13Automated merge with tip of viewer-releaseCallum Prentice
2017-03-13Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2017-03-13increment viewer version to 5.0.4Oz Linden