Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,247 Commits 20 Branches 51 Tags
d6f320fb5e73df8a65d350f3619efb4e40bbfedf
Commit Graph

80 Commits

Author SHA1 Message Date
Liru Færs
2afd2c500b Update VLC and Dullahan. Update vcredist deployment. Thanks Alchemy! 2020-02-25 03:21:27 -05:00
Router Gray
cdc35b3c32 [CMake] Remove add_dependency entries for items listed in target_link_libraries. Superfluous. (Alchemy sync) 
Fixes Linux build errors.
 2019-12-25 09:08:56 -06:00
Router Gray
c68e00730e [CMake Linux] Only include pthread and rt in target_link_libraries for ld.gold support (Alchemy sync) 
Fixes CMake warnings on Linux
 2019-12-25 09:08:48 -06:00
Router Gray
0496374328 [CMake] Use POSITION_INDEPENDENT_CODE property instead of manually setting -fPIC (Alchemy sync) 2019-12-25 09:08:40 -06:00
Rye Mutt
b4243dc95b Enable larger resolution media surfaces for ultrawide monitors 2019-10-07 12:06:42 -04:00
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
Lirusaito
be65834e1b Dullawoof: Okay, this should definitely fix Zoom. 2019-04-10 11:37:41 -04:00
Lirusaito
98bb191c4a Quiet down 2019-04-04 23:43:13 -04:00
Lirusaito
c848af3960 Merge in Dullahan support from future branch! 2019-04-01 01:26:16 -04:00
Drake Arconis
8a6bb4c00a Add options for LTO and Incremental Linking for windows 2016-01-17 08:19:17 -05:00
Drake Arconis
a17b849d84 Manifest for windows 10 2016-01-16 16:39:36 -05: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
Shyotl
1c627317ec No longer include llerrorlegacy.h. Updated llstl to include deletion utilites. 2015-06-19 03:54:20 -05:00
Shyotl
b865b92a6a Merge branch 'FMODStudio' 
Conflicts:
	indra/cmake/PNG.cmake
	indra/newview/llnetmap.cpp
	indra/newview/llviewermessage.cpp



PARAMETERS: CLEAN
 2015-01-26 17:15:46 -06:00
Shibe Doge
4d29117148 Doge wuz here. Also barkies. 
░░░░░░░░░▄░░░░░░░░░░░░░░▄░░░░
░░░░░░░░▌▒█░░░░░░░░░░░▄▀▒▌░░░
░░░░░░░░▌▒▒█░░░░░░░░▄▀▒▒▒▐░░░
░░░░░░░▐▄▀▒▒▀▀▀▀▄▄▄▀▒▒▒▒▒▐░░░
░░░░░▄▄▀▒░▒▒▒▒▒▒▒▒▒█▒▒▄█▒▐░░░
░░░▄▀▒▒▒░░░▒▒▒░░░▒▒▒▀██▀▒▌░░░
░░▐▒▒▒▄▄▒▒▒▒░░░▒▒▒▒▒▒▒▀▄▒▒▌░░
░░▌░░▌█▀▒▒▒▒▒▄▀█▄▒▒▒▒▒▒▒█▒▐░░
░▐░░░▒▒▒▒▒▒▒▒▌██▀▒▒░░░▒▒▒▀▄▌░
░▌░▒▄██▄▒▒▒▒▒▒▒▒▒░░░░░░▒▒▒▒▌░
▀▒▀▐▄█▄█▌▄░▀▒▒░░░░░░░░░░▒▒▒▐░
▐▒▒▐▀▐▀▒░▄▄▒▄▒▒▒▒▒▒░▒░▒░▒▒▒▒▌
▐▒▒▒▀▀▄▄▒▒▒▄▒▒▒▒▒▒▒▒░▒░▒░▒▒▐░
░▌▒▒▒▒▒▒▀▀▀▒▒▒▒▒▒░▒░▒░▒░▒▒▒▌░
░▐▒▒▒▒▒▒▒▒▒▒▒▒▒▒░▒░▒░▒▒▄▒▒▐░░
░░▀▄▒▒▒▒▒▒▒▒▒▒▒░▒░▒░▒▄▒▒▒▒▌░░
░░░░▀▄▒▒▒▒▒▒▒▒▒▒▄▄▄▀▒▒▒▒▄▀░░░
░░░░░░▀▄▄▄▄▄▄▀▀▀▒▒▒▒▒▄▄▀░░░░░
░░░░░░░░░▒▒▒▒▒▒▒▒▒▒▀▀░░░░░░░░
 2015-01-13 17:31:20 -05:00
Shyotl
ab4561aacc Linux build pass. 2014-12-08 18:46:15 -06:00
Latif Khalifa
17c59f25f5 WIP[win64]: it builds, runs. webkit disabled in cmake for now 2013-10-20 17:03:48 +02:00
Latif Khalifa
c3226b25fe Fixed Windows build 2013-10-10 00:18:47 +02:00
Aleric Inglewood
909be9e169 Add AITESTPLUGIN 
Usage:

nc -l -p 61916
AITESTPLUGIN=1 LL_WRAPPER='gdb --args' ./singularity

Then paste into nc:

<llsd>
    <map>
        <key>class</key>
            <string>internal</string>
        <key>name</key>
            <string>load_plugin</string>
        <key>params</key>
            <map>
                <key>dir</key>
                    <string>/opt/secondlife/viewers/singularity/SingularityViewer/linden/indra/viewer-linux-x86_64-debug/newview/packaged/bin/llplugin</string>
                <key>file</key>
                    <string>/opt/secondlife/viewers/singularity/SingularityViewer/linden/indra/viewer-linux-x86_64-debug/newview/packaged/bin/llplugin/libbasic_plugin_filepicker.so</string>
            </map>
    </map>
</llsd>

and press control-v control-shift-2

Where the path should match the library you want to load.
 2013-10-08 15:34:22 +02:00
Shyotl
9c8cfcfd0a Fixed crash upon clicking media prim (disabled prim media control floater for now). Fleshed out media browser replacement (LLFloaterWebContent). 2013-06-02 23:47:47 -05:00
Shyotl
d4a545fb16 More WIP moap changes. Browser elements now function, added many required settings and notifications, and fixed some crashes and other bugs. 2013-06-01 05:11:18 -05:00
Shyotl
ef3e918558 Initial moap commit. /VERY/ WIP. Primarily committed to clean up unstaged changes. Do not run this, even if it may compile, as it will NOT work (for a myriad of reasons)! 2013-05-31 05:33:41 -05:00
Inusaito Sayori
8f3fe5dfae File mode fixes for some exe, plist, and glsl files. 2013-05-18 11:45:27 -04:00
Siana Gearz
d6d5d5ae1b Bring back memory stat! Someone is a clobbermonster. 2013-04-23 11:46:44 +02:00
Shyotl
d71210e942 Trivial changes, mostly to clean up diff noise. Majority of changes are comment corrections or licenseinfo updates. (does not include newview directory) 2013-01-07 14:44:54 -06:00
Siana Gearz
3d84157325 Revert "Probably antivirus-friendlier SLPlugin" 
This reverts commit 817085c172.
 2012-11-13 18:41:58 +01:00
Siana Gearz
303c74f4c9 Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer 
Conflicts:
	indra/llmessage/llurlrequest.cpp
	indra/newview/llvoavatar.cpp
 2012-11-12 06:46:58 +01:00
Drake Arconis
d56393b134 Merge remote-tracking branch 'singu/master' 
Conflicts:
	indra/cmake/WebKitLibPlugin.cmake
	indra/llmessage/llurlrequest.cpp
	indra/plugins/webkit/media_plugin_webkit.cpp
 2012-10-04 16:17:41 -04:00
Drake Arconis
4be8b50360 Merge branch 'master' into llqtwebkit 2012-09-22 22:45:56 -04:00
Aleric Inglewood
56f2f0b727 Merge branch 'curlthreading2' into curlthreading3 2012-09-19 04:14:25 +02:00
Aleric Inglewood
19f325aa09 Merge remote-tracking branch 'singu/master' into curlthreading2 
Conflicts:
	indra/llcommon/CMakeLists.txt

Resolved with kdiff3 automatically.
 2012-09-19 04:11:16 +02:00
Siana Gearz
855540b5c5 Have i beaten you now, evil extortionists? 2012-09-15 21:31:33 +02:00
Aleric Inglewood
b5b6d3f85c Fix PluginAttachDebuggerToPlugins for linux. 
This fixes the problem that many terminals require command line
parameters to be passed as command line parameters to the terminal
command. The old code would pass the whole gdb command including
all it's arguments (whatever replaces %s) as a single argument,
regardless of whether there are quotes around the %s or not.
Now those arguments are passed as separate arguments if there
are no quotes around the %s.

Updated documentation with an example on how to open a gdb terminal
on a different machines X display.
 2012-09-14 19:38:05 +02:00
Drake Arconis
9b358a1b39 Initial llqtwebkit 2012-09-08 02:03:07 -04:00
Aleric Inglewood
e7cd445491 Merge branch 'curlthreading2' into curlthreading3 2012-09-06 15:12:22 +02:00
Aleric Inglewood
a8f5bf8baf Bug fix. 
dlerror() returns NULL when no errors have occurred since the last call
to dlerror() (or since the last call to dlopen(), dlsym() or dlclose()).
 2012-09-05 02:15:41 +02:00
Aleric Inglewood
536cb6febd Merge branch 'curlthreading2' into curlthreading3 
Conflicts:
	indra/CMakeLists.txt
	indra/llcommon/llstring.h
	indra/llmessage/CMakeLists.txt
	indra/llmessage/llhttpclient.cpp
	indra/llmessage/llhttpclient.h
	indra/llmessage/llurlrequest.cpp
	indra/llmessage/llurlrequest.h
	indra/newview/hipporestrequest.cpp
	indra/newview/llappviewer.cpp
 2012-08-15 00:51:40 +02:00
Drake Arconis
769a7b89d2 More Media Updates 
Further updated llviewermedia
 2012-08-03 23:14:03 -04:00
Aleric Inglewood
3b7887a041 Cleanup of some unnecessary dependencies. 2012-07-29 01:30:11 +02:00
Siana Gearz
2334793554 Build SLPLugin.exe without tcmalloc, for SkyDrive 2012-07-19 03:24:44 +02:00
Drake Arconis
525e9d9a8e Webkit plugin updates 
Updated the webkit plugin with the latest features
Fixed SSL support in webkit
Other minor cleanup
 2012-07-06 11:37:45 +00:00
Aleric Inglewood
782091ff02 Print useful error when dlopen() return NULL on linux standalone. 2012-06-27 04:27:08 +02:00
Siana Gearz
817085c172 Probably antivirus-friendlier SLPlugin 
To detour SetUnhandledExceptionFilter to a dummy function, don't use WriteProcessMemory which
is usually used for inter-process writes and debugging. Instead, use more common technique
based on VirtualProtect.
 2012-04-21 13:15:03 +02:00
Siana Gearz
29045609a3 Attempt to fix linking on newer linux 2011-12-23 18:31:47 +01:00
Siana Gearz
f386fc75df Did SELinux complain about THIS? 2011-10-31 05:24:00 +01:00
Siana Gearz
4606c7512e Icon mishaps, thx Cryo for spotting. +Standalone fix 2011-10-21 04:54:55 +02:00
Siana Gearz
f3c8419de8 GCC 4.3 wasn't happy 2011-10-18 04:15:08 +02:00
Shyotl
008bebd817 Merge with siana/future 2011-10-13 00:03:56 -05:00
Shyotl
244e30297f AIAPRPool, AIAPRRootPool, AIVolatileAPRPool, AIThreadLocalData etc, were rebranded by LL. Merging change to clean up diffs. 2011-09-20 22:08:48 -05:00