Age | Commit message (Collapse) | Author |
|
on macOS
|
|
|
|
# Conflicts:
# indra/llrender/llgl.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llui/llflatlistview.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/lldrawpoolground.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorygallery.cpp
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llvosky.cpp
# indra/newview/skins/default/xui/en/menu_inventory.xml
|
|
# Conflicts:
# indra/llcommon/CMakeLists.txt
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewergenericmessage.cpp
# indra/newview/llvoavatar.cpp
|
|
Don't mix CoInitialize and CoInitializeEx, one is global, other is
threaded.
CoInitialize(0) is equal to CoInitializeEx(0, COINIT_APARTMENTTHREADED)
and MULTITHREADED is not compatible with APARTMENTTHREADED.
|
|
|
|
For now it's when there's no GTK, to minimise diff.
They should all just use SDL.
|
|
|
|
|
|
|
|
multihreaded GL not working on mac (thanks, Rye!)
|
|
|
|
|
|
|
|
|
|
Doesn't filter the list yet, just shows full list of usb devices
Selecting visible devices doesn't work yet
|
|
|
|
the fact that crashes started around the time VRAM accounting was added.
|
|
|
|
Copying from GTK users part though.
|
|
The reason it kept crashing was because it is now a requirement for the
OpenGL version to be "detected" as equal or higher than 4.09.
All this time (or maybe since macOS switching to SDL2), Megapahit has been
given only OpenGL 2.1 by macOS (4.1 on SL viewer & Alchemy, though funny
it's 2.1 too somehow on Kokua), and now is fixed by setting the profile
to core 4.1 from SDL2.
The commit is on this branch only cause somehow this fix didn't work
on main branch (it crashed). So 6.6.x is stuck with 2.1 for macOS.
We're moving forward with this branch anyway, which will be merged to main
in the (hopefully near) future.
|
|
|
|
See 7dd1149e3649057f0962b85bdc467f4e9299b235.
The attributes only needed to be moved from LLWindowMacOS X to LLWindowSDL.
|
|
including the new getAvailableVRAMMegabytes.
The "override" word must be explicitly stated now.
|
|
|
|
|
|
so that implementations that don't include a certain GL implementation
won't fail trying to compile the code.
|
|
First, in order for launch_url.sh to be executable, it needs to be
installed as a program.
Secondly, the spawn browser command path needs to be adjusted
accordingly.
And last, add chrome (applies to chromium too on FBSD), to the list of
browser commands to try (so chrome wasn't there :/, but dillo has always
been XD, and that's why it kept opening Dillo here haha).
|
|
HiDPI support & multi threaded OpenGL haven't been used since we
switched to SDL2 on Darwin, and so far there hasn't been any sign
that things aren't working any more significantly.
|
|
The alt mouse click to cam is broken for now on macOS,
but this is the path we've chosen.
|
|
I don't know why SDL2 isn't defining the macro by default when it's been
compiled and installed on an Arm environment, that it has to be manually
defined. I may be missing something here..
|
|
It's an error according to GCC when defined but not used.
It could, and probably should, still be used anyway, just not the SDL
version.
|
|
On SDL2, there are no more x11.lock_func or x11.unlock_func, so the
camming is too sensitive, and alt tab is overridden too when it
shouldn't be. It's better than nothing at all for now. This feature
should be re-perfected later.
|
|
|
|
Both keycodes and scancodes are now 32 bits, so the key type is
lengthened from U16 to U32.
|
|
|
|
Useful when installed as shared libraries, so other viewer executables
can share these libraries.
|
|
by removing cyclic dependencies, and allowing shlib undefined on
SLPlugin alone.
|
|
The style conventions aren't really being followed that the different
styles of using tabs or spaces as indentations lead to GCC considering
them as misleading.
It's better to just fix them (but as little as possible as to minimise
this fork difference from upstream) than to supress the warnings from
being treated as errors.
|
|
On GCC, compiling against a recent GTK2 version would stop on deprecated
pre-processors.
|
|
and any Linux SDL code should be applied to FreeBSD too.
|
|
in order to get rid of this:
error: invalid new-expression of abstract class type ‘LLWindowSDL’
fullscreen, clearBg, enable_vsync, use_gl, ignore_pixel_depth, fsaa_samples);
note: because the following virtual functions are pure within ‘LLWindowSDL’:
class LLWindowSDL : public LLWindow
^~~~~~~~~~~
virtual void* createSharedContext() = 0;
^~~~~~~~~~~~~~~~~~~
virtual void makeContextCurrent(void* context) = 0;
^~~~~~~~~~~~~~~~~~
virtual void destroySharedContext(void* context) = 0;
^~~~~~~~~~~~~~~~~~~~
virtual void toggleVSync(bool enable_vsync) = 0;
^~~~~~~~~~~
The window has been relying on some, mostly GL context related, methods.
These methods are declared abstract, so for now they're implemented
using member functions that do nothing, return nothing.
|
|
|
|
|
|
|
|
improvements can lead to perceived inventory loss due to cache corruption"
This reverts commit cf692c40b0b9f8d0d04cd10a02a84e3f697a2e99.
|
|
|
|
# Conflicts:
# doc/contributions.txt
|
|
|
|
# Conflicts:
# doc/contributions.txt
# indra/llcharacter/llkeyframemotion.cpp
# indra/newview/llfilepicker.cpp
|