Commit Graph

121 Commits

Author SHA1 Message Date
Rye Mutt
8561af1f84 Add abseil hashmaps and use in texture list, also fix bugs in texture list insertion 2019-09-28 19:03:49 -04:00
Liru Færs
1b52b3e685 Merge branch 'animesh' of git://github.com/Shyotl/SingularityViewer into animesh
# Conflicts:
#	indra/llcommon/llindexedvector.h
2019-08-15 20:50:36 -04:00
Shyotl
f09b828217 Use wgl shared context lists to avoid re-creating gl context from scratch. 2019-08-07 23:02:34 -05:00
Router Gray
ee6f919ea7 [Linux] Properly detect full screen resolutions. Thx Laffalott reporting and Henri Beauchamp for code. 2019-08-01 08:48:15 -05:00
Shyotl
1bd6ba61a7 Improve vram detection on systems with multiple gpu devices. 2019-07-22 01:31:15 -05:00
Shyotl
899d09bfcc Don't /actually/ run in true core context yet as people like to play with settings they don't understand. 2019-07-21 02:33:12 -05:00
Shyotl
225d174ec6 MIN_MEM_FOR_NON_TEXTURE setting doesn't work well with new math. Lower signifigantly. 2019-07-18 01:33:47 -05:00
Shyotl
b5cb6459b0 Tweak memory detection algorithm. 2019-07-03 16:00:16 -05:00
Shyotl
3724cf0e68 Fixed some more header issues. 2019-04-11 03:12:48 -05:00
Shyotl
1351a2695e Merge branch 'animesh' of https://github.com/Lirusaito/SingularityViewer.git into animesh
# Conflicts:
#	indra/newview/llspatialpartition.cpp
#	indra/newview/llvoavatar.cpp
#	indra/newview/llvovolume.cpp
2019-04-11 02:02:05 -05:00
Shyotl
e49b484c2f Updated rigged mesh selection/cursor hover handling. 2019-04-11 01:16:50 -05:00
Lirusaito
a14df55bd8 Liru never gets to sleep, not even when sick
Thanks Drake.

We don't get to use std::system, standardization is a sham,
nothing is sacred, why does anyone even bother?

Have a potentially broken Mac Implementation, too, why not?
It's not like we compile on mac anyway right now.
2019-03-23 04:57:56 -04:00
Lirusaito
b3f918970b Let's print out nonzero return codes 2019-03-23 00:57:06 -04:00
Lirusaito
3d26f79b8b Dumb 2019-03-23 00:49:53 -04:00
Lirusaito
273c9b3479 Call ShellEx for launching urls in browser on Windows 2019-03-19 21:28:39 -04:00
Lirusaito
83270e13f8 Woops, where'd that semicolon go when we most needed it? 2019-03-19 02:43:53 -04:00
Lirusaito
cfc71a47db Fix up ShellEx
It's now crossplatform wrapper for std::system opening of a file/path/url.
It returns an int just like std::system, 0 means it worked.
It's static so you don't need to gViewerWindow->getWindow() anymore,
honestly it should've been static in the first place.

Clean up other code to use this function because duplicate code sucks.

# Conflicts:
#	indra/llwindow/llwindowmacosx.h
#	indra/llwindow/llwindowsdl2.cpp
2019-03-19 02:43:35 -04:00
Lirusaito
45228f920d Cleanup excess code and gURLProtocolWhitelist, add isWhitelistedProtocol()
# Conflicts:
#	indra/llwindow/llwindowmacosx.cpp
#	indra/llwindow/llwindowsdl2.cpp
2019-03-19 02:41:31 -04:00
Lirusaito
88639c2052 Merge branch 'master' of git://github.com/Shyotl/SingularityViewer into ManagedMarketplace 2019-03-06 17:10:33 -05:00
Lirusaito
324f12641a Remove redundant casts from c_str to string
Thanks Aru
2019-03-06 16:11:42 -05:00
Shyotl
7317f28ab3 Clean up compressed texture handling. Exclude dynamic/client generated/local textures. Got rid of glh headers. 2019-03-04 02:03:45 -06:00
Lirusaito
58ba9e3617 Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 2019-03-02 19:01:49 -05:00
Lirusaito
45c7c711ad You need to wake upYou need to wake upYou need to wake upYou need to wake up
YouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUp
ouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpY
uNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYo
NeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYou
eedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouN
edToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNe
dToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNee
ToWakeUpYouNeedToWakeUpNeedWAKEUPNeedYouNeedYouWakeUpYouNeed
oWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedT
WakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedTo
akeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToW
keUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWa
eUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWak
UpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWake
pYouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeU

[~~~~~~~~~~~~~~~~~~~~~~~~~~WakeUp~~~~~~~~~~~~~~~~~~~~~~~~~~]
2019-02-03 12:31:36 -05:00
Lirusaito
7112e163e6 Update our url stuffs!
Adds support for JIRA link labels from Alchemy. (Made less of a mess by me)
Adds support for x-grid-info, the future of x-grid-info-location from Alchemy.
Updates uriparser latest from Alchemy.
Updates llstring to be more in line with upstream Alchemy.
Fixes our LLURI Implementation
Updates LLURLAction to modern C++ stuffies~
Adds Email protocol support from alchemy
Sync LLSLURL with Alchemy, adding x-grid-info support.
Also keep NoProtocol Support because yaaassss~
(also we won't suffer from MAINT-5019 because we're not dumb.)
2019-01-20 09:13:05 -05:00
Shyotl
736696ac36 Track glEnable states via static refs instead of map lookups.
Sync light state, bound shader, and various gl context states similarly to render matrices.
Texture handles now refcounted, as multiple viewer textures could ref the same handle (cubemaps do this)
Clean up gl extension loading a bit. Not necessary, but only look for ARB variants if not included in current core version. Removed unused extensions.
Use core shader api if supported, else use ARB. (FN signatures are identical. Just doing some pointer substitution to ARB if not core.)
Attempt at improving VBO update batching. Subdata updates better batched to gether per-frame.
There's probably other stuff I forgot that is in this changeset, too.

Todo: Fix lightstate assertion when toggling fullscreen with shaders off.
2018-11-19 00:37:48 -06:00
Shyotl
bc8c95a7f7 Minor cleanup. 2018-08-10 18:17:30 -05:00
Shyotl
fe764ae97f Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer.git 2018-08-07 21:46:07 -05:00
Shyotl
b5f0355015 Dpi awareness should be set before creating the application window. In theory dpi awareness shouldn't have worked without this. 2018-08-07 01:10:48 -05:00
Drake Arconis
a8e8f6d409 Fix gamma corruption 2018-04-26 15:54:30 -04:00
Drake Arconis
54fe7a8606 Well this...compiles 2018-04-26 15:54:24 -04:00
Shyotl
798f4c1a69 Avoid needing winver 601. 2018-04-09 02:50:44 -05:00
Shyotl
d3e1edcc93 Windows dpi scaling. 2018-04-09 02:08:46 -05:00
Shyotl
f4a713a500 Merge. 2017-03-14 04:02:53 -05:00
Lirusaito
4afc6f5b6a Woops, removed the wrong set of two. 2016-03-28 07:58:30 -04:00
Lirusaito
e62261edb2 Sync with Alchemy, includes much awaited lib updates for Linux
Applies ALCH-420 - Replace all invisiprims with fully transparent texture and remove dead code paths
-ARC no longer takes invisis into consideration.

Syncs some script keywords updates.

Changes all "\n" in llfloaterabout.cpp to '\n' because screw.dat
2016-03-27 23:24:17 -04:00
Lirusaito
79965fade1 Alchemerge
Applies the following alchemy patches:
28fe46209ea5: Don't spam setPaused in fmod studio audio stream code
eb12ff41434a: Fix single click to walk triggering on huds
31955a7826b9: Fix double click to walk being triggered by huds and touchable objects
Fix double click to walk triggering while sitting and flying
Fix double click to walk behavior being inconsistent with single click to walk
Fix double click teleport being affected by transparent objects
Properly fixes MAINT-957

Compile stuff updates:
Adds VCRedist to package, should fix failure to launch reported by Nomade Zhao.
Updates package_description to better suit Singularity
Turns secondlife-bin in places to singularity-bin

Updates the following libraries:
Curl (7.47.0), gperftools (0.0.2), openssl (1.0.2f), SLVoice on Linux64,
2016-02-25 21:13:13 -05:00
Drake Arconis
01bf430b1a Get linux64 somewhat working 2016-01-19 10:07:27 -08:00
Drake Arconis
d219087950 Remove llqtwebkit, add cef 2016-01-16 16:14:04 -05:00
Drake Arconis
2f2e1fbe8f Major breaking changes 2016-01-16 08:05:47 -05:00
Siana Gearz
62a7704a4f You shaved 2 minutes off compile time...
... but you are still hungry
2015-09-18 04:29:38 +02:00
Shyotl
1c627317ec No longer include llerrorlegacy.h. Updated llstl to include deletion utilites. 2015-06-19 03:54:20 -05:00
Shyotl
690f3614c1 Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git
Conflicts:
	indra/llrender/llpostprocess.cpp
2015-05-16 02:53:19 -05:00
Shyotl
f827d77600 Verify CoInitialize call was successful (on Windows only). 2015-05-16 02:31:32 -05:00
Drake Arconis
1e0243aa3d Fix some 64bit-unsafe windows code 2015-05-12 09:11:59 -04:00
Inusaito Sayori
8b7b0649a8 Uncomment use of etc/ for spawnWebBrowser on Linux, now that we use etc/ for scripts.
Thanks to H-H-H for pointing this out.
2015-04-19 18:08:49 -04:00
Inusaito Sayori
72080e79e9 Sync llcommon with Alchemy a bit.
llmath::llround->ll_round
LL_ICC->LL_INTELC
Add llpredicate
Add LL_CPP11 macro
Remove llhash
Update llinitparam, llsd and all relatives of it.
2015-03-20 22:04:04 -04:00
Inusaito Sayori
43a9aedf7d Sync with Upstream Alchemy
Changes LLEnvManagerNew::setRegionChangeCallback to LLAgent::addRegionChangedCallback
Cleans up some of the timeout policies that aren't necessary any longer.
Modernizes parts of LLViewerKeyboard, updates llregistry.h
Begins changeover from LLDynamicArray to std::vector
Minor merge of newer, trivial SSA functions.
Introduces LLAgent functions: addParcelChangedCallback and canJoinGroups
Support for secondlife:///app/appearance SLapps.
Cleans up older functions.
2014-09-04 17:32:03 -04:00
Inusaito Sayori
e1851f7b5b Sync llwindowwin32 with Alchemy. 2014-08-22 21:47:52 -04:00
Inusaito Sayori
a126b4003f Fix the first double click of every session failing. 2014-08-22 21:43:48 -04:00
Inusaito Sayori
5191baa659 Merge branch 'master' of https://bitbucket.org/Shyotl/singularityviewer-internal
Conflicts:
	indra/newview/llnetmap.cpp - Thankies Shyotl~
2014-07-21 23:31:59 -04:00