Commit Graph

5153 Commits

Author SHA1 Message Date
Drake Arconis
a4fa66655e Unbreak OSX Make File builds 2013-10-07 23:23:51 -04:00
Drake Arconis
610f7ac5de Fix a Clang error 2013-10-07 23:23:40 -04:00
Drake Arconis
a1751dcc1e Warning fix 2013-10-06 22:55:30 -04:00
Drake Arconis
817c01595f I really really hate you microsoft. More windows sdk cmake poke 2013-10-06 22:55:21 -04:00
Drake Arconis
128503fd7f Attempt to fix linking issues 2013-10-06 22:54:38 -04:00
Latif Khalifa
a1c43e3539 Fixed mac build. How the heck did this get there? 2013-10-06 16:34:56 +02:00
Latif Khalifa
85f4fa9000 Merge branch 'boost152' 2013-10-06 08:13:31 +02:00
Latif Khalifa
dd680f27d4 Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer 2013-10-06 08:13:11 +02:00
Latif Khalifa
2c091a954f Breaking pad: try to send the correct log file 2013-10-06 08:12:17 +02:00
Latif Khalifa
26f4c4a773 Boost throws exceptions 2013-10-06 08:11:07 +02:00
Latif Khalifa
ee007f322b Rebuilt Collada with new boost from https://github.com/singularity-viewer/3p-colladadom/commits/singularity 2013-10-06 07:50:38 +02:00
Latif Khalifa
aece3c7069 Don't copy pcre on linux64 2013-10-06 07:49:38 +02:00
Latif Khalifa
9f0af64963 More boosted fun 2013-10-06 01:55:12 +02:00
Inusaito Sayori
337c0d9cbb [Warnings] Remove warning suppressions for colladadom
I have fixed the warnings internally, so this wraps up my work
But our colladadom source and our prebuilds must be updated with my changes before this change is tolerable
2013-10-05 19:02:17 -04:00
Inusaito Sayori
4423bef896 [Warnings] Reduce collada includes to bare minimum to lessen Mac warnings 2013-10-05 18:33:07 -04:00
Inusaito Sayori
23e72f3978 [Warnings] Fix signed/unsigned mismatches rather than disabling 4018 2013-10-05 18:23:13 -04:00
Latif Khalifa
200b812182 Link boost statically 2013-10-05 22:09:54 +02:00
Latif Khalifa
4118afc146 Boost upgrade to 1.52 2013-10-05 20:27:20 +02:00
Aleric Inglewood
034ff0a305 Fix google breakpad for standalone.
The normal usage is to include the src/ directory of google breakpad
in your application and then include client/ARCH/handler/exception_handler.h
where ARCH is windows, mac or linux.

However, Linden Lab for some reason packaged the breakpad prebuilt
with exception_handler.h installed in ../google_breakpad/exception_handler.h
where "../google_breakpad" is the 'root' of the include tree comparable
with 'src' in the source tree of google breakpad.

Hence, instead of including 'src' one now must include '../include/google_breakpad'
which was already done correctly for non-standable, but not for
standalone (BREAKPAD_EXCEPTION_HANDLER_INCLUDE_DIR was set to '../include'
with the 'google_breakpad' and is subsequently never used: instead
BREAKPAD_INCLUDE_DIRECTORIES is used (which is set for non-standalone)).

Therefore one much not include "google_breakpad/exception_handler.h",
but just "exception_handler.h" or you rely on somehow the directory
*below* BREAKPAD_INCLUDE_DIRECTORIES to be part of the include path as
well.

Finally LL packages the prebuilt if another duplicate minidump_descriptor.h
in the include root. Also here including "minidump_descriptor.h" would
be better correct, but following the instructions by Google this time
we might as well include the original "client/linux/handler/minidump_descriptor.h".

My repo (http://github.com/AlericInglewood/3p-google-breakpad) doesn't
even put minidump_descriptor.h in the root anymore, only
exception_handler.h. The rest is an exact copy of the 'src' tree with
regard to the headers.

Tested to compile both standalone and non-standalone.
2013-10-05 19:44:37 +02:00
Inusaito Sayori
eeeca2197e Revert "Harden agains network packet overruns"
This reverts commit 6c1ea557b5.
2013-10-05 04:31:57 -04:00
Inusaito Sayori
16a8b92d84 [OpenSimExtras] Added callback setters to for the new chat ranges
Though they're not in use yet.. they should be in use soon, either way should exist.
2013-10-05 03:39:59 -04:00
Inusaito Sayori
de1a459bcb [OpenSimExtras] Variable chat ranges viewer awareness, thanks Diva Canto!! 2013-10-05 03:20:25 -04:00
Inusaito Sayori
7448ca1046 Bit of cleanup for simfeature handler 2013-10-05 03:04:58 -04:00
Inusaito Sayori
8f5337cc67 Tooltip for grids combo box to clarify its new uses for unfamiliar users 2013-10-04 21:01:02 -04:00
Inusaito Sayori
d7782383f1 Brokepad Mountain: Fix mac compiler warning by removing unused function and its unused static variable 2013-10-04 18:29:25 -04:00
Latif Khalifa
5f5943548b Merge branch 'master', remote-tracking branch 'origin' 2013-10-04 23:06:24 +02:00
Latif Khalifa
4cd3291bd1 Merge branch 'master' of https://github.com/slabua/SingularityViewer 2013-10-04 23:05:52 +02:00
Latif Khalifa
d595eb3314 Breaking pad: link SLPlugin.app with the exacption handler
Fixes loading of SLPlugin on OS X
2013-10-04 23:00:48 +02:00
Inusaito Sayori
f770cb1a29 There's no such thing as ATI Geforce... this seems to have been added because of VWR-29593, but there's no such thing... 2013-10-04 04:43:14 -04:00
Inusaito Sayori
36d658c4c4 Feature Request: Make Log viewing cross platform by opening in a browser window
INB4 Windows users express discomfort.
2013-10-03 19:59:11 -04:00
Inusaito Sayori
cfeb50ae4d Breaking pad: warning: 'OSStatus CarbonEventHandler(OpaqueEventHandlerCallRef*, OpaqueEventRef*, void*)' defined but not used 2013-10-03 13:46:16 -04:00
Inusaito Sayori
2b61394234 Fix /singularity/singularity-master/indra/plugins/filepicker/llfilepicker.cpp:762:61: warning: multi-character character constant
OSTypes are four byte sequences, therefore we should use 'JP2 ' instead of 'JP2'
2013-10-03 13:20:47 -04:00
Inusaito Sayori
1c96fa09fd Fix a few signed unsigned mismatches 2013-10-03 12:41:10 -04:00
Salvatore La Bua
5183adbcaa Merge branch 'master' of github.com:singularity-viewer/SingularityViewer 2013-10-03 11:47:23 +02:00
Salvatore La Bua
6abffb2ce4 Merge branch 'master' of github.com:DamianZhaoying/SingularityViewer 2013-10-03 11:47:01 +02:00
Latif Khalifa
8bdc92c99b Breaking pad: don't add special pre-copy files to build dir 2013-10-03 07:53:43 +02:00
Latif Khalifa
8da3e86250 Don't copy files unless we need to extract the debug symbols 2013-10-03 07:19:14 +02:00
Inusaito Sayori
f3df986647 Merge branch 'master' of https://github.com/abaph/SingularityViewer 2013-10-03 00:53:44 -04:00
Latif Khalifa
2a8b424b85 Merge branch 'breakpad3' 2013-10-03 06:38:41 +02:00
Latif Khalifa
7e02a5825e Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer 2013-10-03 06:37:57 +02:00
Latif Khalifa
c49907e5a4 Breaking pad: typofix 2013-10-03 06:20:14 +02:00
Latif Khalifa
60cd95b31f Breaking pad: more cmake fun 2013-10-03 06:09:49 +02:00
Andros Baphomet
c39d66b547 Improved X log parser to handle VirtualGL systems, removed old X log parser 2013-10-02 21:35:17 -04:00
Inusaito Sayori
a5928f4dbf Chatbar as cmdline, return false to avoid chatting certain commands 2013-10-02 20:34:20 -04:00
Latif Khalifa
9d4b978474 Breaking pad: Linux symbol dumping 2013-10-03 02:18:53 +02:00
Latif Khalifa
3447e9bd78 Brealpad: fixed symbol extraction on Mac 2013-10-03 00:26:54 +02:00
Latif Khalifa
a27dad4db0 Breakpad: added symbol extraction to the build.
Add -DRELEASE_CRASH_REPORTING:BOOL=ON to enable symbol extraction
on build time. Viewer without this set won't sent crash
reports to the crash server
2013-10-02 18:23:19 +02:00
Latif Khalifa
ba1b482025 Also repackage bin folder 2013-10-02 17:49:57 +02:00
Andros Baphomet
f6f9e5b802 Rewrote X log parser in VRAM detection code 2013-10-02 00:17:45 -04:00
Latif Khalifa
399a0038cb Breakpad: now working Mac OS X 2013-10-02 04:14:58 +02:00