Commit Graph

105 Commits

Author SHA1 Message Date
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
Inusaito Sayori
b9ba472eda Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
Conflicts:
	indra/newview/llspeakers.cpp
Compile fixes:
	indra/newview/llgroupmgr.cpp - uncomment new API for GroupBanDataResponder
2014-07-21 19:56:35 -04:00
Inusaito Sayori
8a2e24ecd0 Sync with viewer-tiger~
Syncs up llmath stuffs.

Thanks to Shyotl for the CMakeLists fix for Wbemuuid.
2014-07-11 20:36:19 -04:00
Aleric Inglewood
6ccca51fee Compiler warning fixes.
g_thread_init is automatically called since 2.32 (and deprecated since 2.35).
g_type_init is automatically called since 2.36 and will be deprecated in the
future.
2014-07-11 17:10:27 +02:00
Aleric Inglewood
a4b3c3d1ad Remove self dependency of llwindow.
Needed to avoid an error message from cmake 2.8.12.1 and higher
(policy 0022).
2014-07-11 16:32:55 +02:00
Shyotl
9cbcf8fe34 Removed glh_linear and glu dependencies from viewer. 2014-07-03 02:11:45 -05:00
Inusaito Sayori
fb69220b95 Merge branch 'master' of git://github.com/lkalif/SingularityViewer 2014-05-27 12:57:45 -04:00
Shyotl
c4cb9de44b Merge branch 'master' of git@github.com:singularity-viewer/SingularityViewer.git 2014-05-17 16:30:21 -05:00
Inusaito Sayori
cd87aadab3 Missed a spot. 2014-05-15 00:42:22 -04:00
Inusaito Sayori
e58f8856f4 Add support for Controller Keys, inspired by similar code by CtrlAltStudio Viewer
Dear Alpha Users who are curious about this:
A = Alt
B = Shift
X = Ctrl
Y = Escape
Back = Toggle Flycam mode (Use this, it's fun!!!)
Start = Toggle Cursor mode
Right Stick Click = Toggle Mouselook
Left Stick Click = Jump/Fly

Enjoy, I know I do!
2014-05-14 23:48:27 -04:00
Shyotl
846d573dd0 Kill stray #endif that snuck into commit. 2014-05-14 16:45:55 -05:00
Shyotl
22bcf83cb9 Toyed with gl init ordering. Fixes adaptive vsync. May explode on linux, not that adaptive vsync works there, but it should in theory work there if we ever port to sdl2. If it does explode, I'll know shortly... probably. 2014-05-14 03:10:34 -05:00
Inusaito Sayori
656eacbb09 Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 2014-05-08 19:57:01 -04:00
Shyotl
162e7b7699 Fixed a silly mistake that was causing vsync to be enabled when it should have been. Also fix typo in objectSkinV.glsl previous commit 2014-05-08 15:30:02 -05:00
Cinder
a4c672252d Launch transcripts in external text editor on mac too 2014-04-21 18:05:45 -04:00
Latif Khalifa
ba0fd794d7 Compile fix 2014-03-28 16:20:38 +01:00
Latif Khalifa
dc9d3fbf96 Fix build with SDL prior to 1.3.0 2014-03-28 08:29:30 +01:00