Commit Graph

58043 Commits (ea7526eecf9d9c1d4d4e122a22829660ebbeda43)

Author SHA1 Message Date
Nicky ea7526eecf Linux; Move SDL_GL_CreateContext right after SDL_CreateImage.
Putting it before SDL_GetWindowSurface seems to fix the problems with the NVidia driver.
2019-12-26 20:15:00 +01:00
Nicky 759c43cbb3 Linux; Do ot call SDL_GL_CreateContext if the environment variable FS_NO_SDL_CREATE_CONTEXT is set to 1.
NVidia does not seem to like he SDL_GL_CreateContext while AMD needs it. The documentation on the other hand agrees the call is a must. Needs some more investigation.
2019-12-26 19:33:57 +01:00
Nicky 0bb5632dd9 Linux; Option to disable tarball via "FS_CREATE_NO_TAR=1 make" when using --pacckage to create a directory to run the viewer from but not having any need for the tar.xz (saving symbols and creating the tarball is slow). 2019-12-26 19:29:03 +01:00
Nicky 84cdf8d902 Linux; Do not try to package directfb files (they get removed wth SDL2). 2019-12-26 18:17:17 +01:00
Nicky 460647607a Linux; Do not try to package any vlc files. 2019-12-26 18:16:12 +01:00
Nicky 88081398ad Update open_libndofdev 0.12 (includes compatibility with vs2017 branch and official SDL2 compatibility). 2019-12-26 02:54:31 +01:00
Nicky eea4c27388 Merge branch 'master' into linux-updates 2019-12-26 02:52:05 +01:00
Nicky 8e877cc02a Linux; Disable ndof_dump to be able to use built 3ps between vs2017 and non vs2017 branches. 2019-12-26 02:14:45 +01:00
Beq 2e809a6a92 Bool is not an allowed type in Settings 2019-12-25 23:37:08 +00:00
Beq 03eb842b40 Make the rebake explicitly OpenSim.
Tracking needs to persist for SL->OS use case
2019-12-23 14:22:41 +00:00
Beq 315e0f6dae Force a rebake on region upd if BOM support changes
Persists last grid BOM support to force rebake across logins,
hopefully this removes the black bakes
2019-12-23 10:56:01 +00:00
Beq cde80582c5 ignore my_autobuild.xml and .vscode detritus 2019-12-22 12:56:40 +00:00
Ansariel ac5817fed1 Make obsolete Merchant Outbox folder deletable 2019-12-18 18:58:00 +01:00
Nicky Dasmijn 5e23499660 Merge branch 'master' into linux-updates 2019-12-18 10:34:06 +01:00
Ansariel 85a83a90f6 Remove .hgtags file 2019-12-16 14:06:18 +01:00
Ansariel f7783ca561 Fix unable to copy&paste into outfits anymore 2019-12-16 14:05:55 +01:00
Ansariel 0f7a3f9147 Merge branch 'fslgpl-hg' 2019-12-14 23:25:13 +01:00
PanteraPolnocy 10627a2fad Updated Polish translaton 2019-12-14 19:43:20 +01:00
Ansariel d12c9550e9 Let's just go with revcount since we're going to build from tip anyway where it matters (this should be ok for LGPL and release repo) 2019-12-14 17:02:34 +01:00
Ansariel c1a06438ba Transition from .hgignore to .gitignore 2019-12-14 16:51:05 +01:00
Nicky c1152886f7 Prepare for git:
- When configured from a git directory (crudely detected by testring for .git/ existance) use AUTOBUILD_BUILD_ID for the revision.
- Oterwise use the locale mercurial change number (as before).
2019-12-14 10:53:00 +01:00
Nicky 476f71f6ce Correct for nonsensical if clause. 2019-12-12 22:57:06 +01:00
Ansariel a53f9f1e26 Make this an S32 as well 2019-12-12 21:08:55 +01:00
Ansariel e29018fa8c Merge LL viewer-release 6.3.5 2019-12-12 19:50:45 +01:00
Ansariel 8afa4331e0 Merge Firestorm LGPL 2019-12-12 19:48:36 +01:00
Nat Goodspeed d656d49a77 increment viewer version to 6.3.6 2019-12-12 13:15:52 -05:00
Nat Goodspeed a231a86952 Added tag 6.3.5-release for changeset 27ca5834bfe9 2019-12-12 13:15:52 -05:00
Beq b665a7a25d Replicate latest grids.xml update to viewer repo (OS Conference regions) 2019-12-12 14:36:34 +00:00
Beq 7c91afb7a9 FIRE-22912 Group send fail on OpenSim 2019-12-12 13:33:03 +00:00
Beq aa9348f3d4 FIRE-23591 Apply Patch from Kevin Cozens. OpenSim improved Map matches
(minor improvements on SL - see https://jira.secondlife.com/browse/BUG-228002)
2019-12-11 14:15:14 +00:00
Ansariel 9ff18d9bbd S32 instead of int 2019-12-10 17:44:57 +01:00
Beq 39617f8608 FIRE-29204 BoM fallback safety measures to protect legacy OpenSim.
limits bakes sent to the server depending on detected BOM capability.
initial tests on current OS tip and pre-BoM 0.9, needs more tests on other vers
2019-12-10 13:44:32 +00:00
Nicky 5469b246d2 Compile time compatibility for KDU 8 2019-12-09 22:06:14 +01:00
Nicky b934806d86 Bugsplat; Guard against region not set (can happen during TP?). 2019-12-09 19:21:23 +01:00
Nicky a88700cdc2 LLVOVolume::markDead can be called with objects not having a volme set (yet). Make sure to not crash on that. 2019-12-07 19:09:35 +01:00
ziree 197ca8e979 Make sure the AO interface doesn't stay blank when already open on login - FIRE-29192 2019-12-05 02:19:19 +01:00
PanteraPolnocy a7c0cd70b5 Updated Polish translation 2019-12-04 18:30:17 +01:00
Beq 295073286a Update grids.xml for new OpenSim grid additions 2019-12-04 14:56:54 +00:00
Ansariel d7aff68e6c FIRE-29082: Adjust help wiki topic for avatar scripts floater 2019-12-03 22:47:19 +01:00
ziree 6bb65a4c6a Make utility bar hide with all other UI parts when alt+shift+u is pressed - FIRE-29188 2019-12-02 22:40:34 +01:00
Ansariel 589fc9c7e5 Add missing localized floater header for outfit picture texture picker 2019-12-01 16:52:40 +01:00
Ansariel 797fa6718b Merge 494-maint-wassail 2019-11-28 17:09:26 +01:00
Ansariel d6f55d9047 Merge Firestorm LGPL 2019-11-28 17:04:58 +01:00
andreykproductengine d3f389a38c SL-12326 Textures' apr pool crash fix 2019-11-26 17:21:43 +02:00
andreykproductengine 28eca3aeb4 SL-12326 Textures' apr pool crash fix 2019-11-26 17:21:43 +02:00
Ansariel bae5bc69fb Let's see if this helps with attachments randomly ending up in L&F: If there is a previous folder ID, just move it back to where they came from 2019-11-24 11:22:14 +01:00
Nat Goodspeed b6befdf713 DRTVWR-494: Merge copy-paste-friendly test output to tip 2019-11-23 22:22:47 -05:00
Nat Goodspeed ba2d727ad4 DRTVWR-494: Merge LLSingleton thread defense to tip 2019-11-23 22:22:03 -05:00
Nat Goodspeed c6ebb20069 DRTVWR-494: Improve thread safety of LLSingleton machinery.
Remove warnings about LLSingleton not being thread-safe because, at this point,
we have devoted considerable effort to trying to make it thread-safe.

Add LLSingleton<T>::Locker, a nested class which both provides a function-
static mutex and a scoped lock that uses it. Instantiating Locker, which has a
nullary constructor, replaces the somewhat cumbersome idiom of declaring a
std::unique_lock<std::recursive_mutex> lk(getMutex);

This eliminates (or rather, absorbs) the typedefs and getMutex() method from
LLParamSingleton. Replace explicit std::unique_lock declarations in
LLParamSingleton methods with Locker declarations.

Remove LLSingleton<T>::SingletonInitializer nested struct. Instead of
getInstance() relying on function-static initialization to protect (only)
constructSingleton() calls, explicitly use a Locker instance to cover its
whole scope, and make the UNINITIALIZED case call constructSingleton().
Rearrange cases so that after constructSingleton(), control falls through to
the CONSTRUCTED case and the finishInitializing() call.

Use a Locker instance in other public-facing methods too: instanceExists(),
wasDeleted(), ~LLSingleton(). Make destructor protected so it can only be called
via deleteSingleton() (but must be accessible to subclasses for overrides).

Remove LLSingletonBase::get_master() and get_initializing(), which permitted
directly manipulating the master list and the initializing stack without any
locking mechanism. Replace with get_initializing_size().

Similarly, replace LLSingleton_manage_master::get_initializing() with
get_initializing_size(). Use in constructSingleton() in place of
get_initializing().size().

Remove LLSingletonBase::capture_dependency()'s list_t parameter, which
accepted the list returned by get_initializing(). Encapsulate that retrieval
within the scope of the new lock in capture_dependency().

Add LLSingleton_manage_master::capture_dependency(LLSingletonBase*, EInitState)
to forward (or not) a call to LLSingletonBase::capture_dependency(). Nullary
LLSingleton<T>::capture_dependency() calls new LLSingleton_manage_master method.

Equip LLSingletonBase::MasterList with a mutex of its own, separate from the
one donated by the LLSingleton machinery, to serialize use of MasterList data
members. Introduce MasterList::Lock nested class to lock the MasterList mutex
while providing a reference to the MasterList instance. Introduce subclasses
LockedMaster, which provides a reference to the actual mMaster master list
while holding the MasterList lock; and LockedInitializing, which does the same
for the initializing list. Make mMaster and get_initializing_() private so
that consuming code can *only* access those lists via LockedInitializing and
LockedMaster.

Make MasterList::cleanup_initializing_() private, with a LockedInitializing
public forwarding method. This avoids another call to MasterList::instance(),
and also mandates that the lock is currently held during every call.

Similarly, move LLSingletonBase::log_initializing() to a LockedInitializing
log() method.
2019-11-23 22:18:45 -05:00
Nat Goodspeed 4cb6e9ee08 DRTVWR-494: Show copy-paste-friendly env vars and test command.
Moderately often I want to copy the (long) integration test program path from
build output and rerun the test program by hand. But typically we need
environment variables set as well so it can find its dynamic libraries. This
has resulted in my copying parts of several lines of build output, then
pasting to a command prompt, then hand-tweaking the pasted text so it makes
sense as a command.

Streamline run_build_test.py output so less hand-tweaking is needed.
2019-11-23 22:16:39 -05:00