Commit Graph

3836 Commits

Author SHA1 Message Date
Drake Arconis
24ec85febd Merge branch 'AltCompilers' of bitbucket.org:LightDrake/singularityviewer into AltCompilers 2012-07-05 14:04:17 +00:00
Drake Arconis
9565d96006 Fixed a typo in repackage.sh
So. I was tired and that happened.
2012-07-05 14:03:53 +00:00
Drake Arconis
822098b5ac Fixed a typo in repackage.sh
So. I was tired and that happened.
2012-07-05 13:44:44 +00:00
Drake Arconis
02ae36b427 OpenSSL Updated.
OpenSSL 1.0.0g
2012-07-05 12:59:50 +00:00
Siana Gearz
f5bfab139c Merge branch 'curlthreading2' of git://github.com/AlericInglewood/SingularityViewer into curlthreading 2012-07-05 06:06:04 +02:00
Drake Arconis
259a9ff0cc Cleanup and more library work
Cleaned up unneeded files in LICENSES already provided by the
prebuilt packages themselves

install.xml:
Added in pcre, colladadom, and windows glod library
Corrected, descriptions licenses, and copyrights.
2012-07-05 02:43:37 +00:00
Drake Arconis
d238cfe753 LibraryWork: Windows Libraries
Repacked the windows libraries for new package layout.
Cleaned install.xml of unused libraries on windows.
Cleaned install.xml of unused libraries on darwin.
Repacked windows gperftools from Kitty/Catznip.
Updated windows openal.
2012-07-05 02:08:27 +00:00
Aleric Inglewood
df20f918ba New libcwd channel 'curlio'.
Enable printing of libcurl 'IO' debug messages when libcwd channel
'curlio' is turned on (added to .libcwdrc). Avoiding a recompile.
2012-07-05 03:10:16 +02:00
Aleric Inglewood
b8fc1f634e Print the curl library found during configure.
Prints something like:
-- Found CURL: /usr/lib/x86_64-linux-gnu/libcurl.so (found version "7.25.0")
2012-07-05 01:41:01 +02:00
Aleric Inglewood
ae9dadb5d8 Improved layout of curl stats print out. 2012-07-04 16:56:33 +02:00
Siana Gearz
d31c062693 Fix building with libcwd 2012-07-04 12:44:05 +02:00
Drake Arconis
31ca817dc0 Removed ReleaseSSE2
Removed ReleaseSSE2 and moved its options under Release.
2012-07-04 10:25:04 +00:00
Siana Gearz
544928a039 Merge branch 'curlthreading2' of git://github.com/AlericInglewood/SingularityViewer into curlthreading 2012-07-04 10:45:48 +02:00
Siana Gearz
30f49526db Stray settings be gone 2012-07-04 10:44:37 +02:00
Aleric Inglewood
14276b3cf8 Bug fix 2012-07-04 08:44:22 +02:00
Lirusaito
b194d9e012 Sync llpaneleditwearable to Shyotl/V2MultiWear version. 2012-07-04 02:02:50 -04:00
Aleric Inglewood
07e7eeedd1 Added some windows code.
Iterating directly over the elements of fd_set::fd_array in
windows is faster than using FD_ISSET.
2012-07-04 07:32:24 +02:00
Drake Arconis
5748de1f9d More changes for lib and packaging update 2012-07-04 04:41:33 +00:00
Drake Arconis
d0c1c4d753 Dos2Unix line endings and a file mode change 2012-07-04 00:29:59 +00:00
Drake Arconis
7af331c50d First set of changes for new librarys and lib layout support!
Modified repackage script to support new layout
Fixed webkit to work against new llqtwebkit
2012-07-04 00:26:42 +00:00
Aleric Inglewood
125a10bb44 Code hardening, review, bug fixes, documentation, curl stats and cleanup.
Bug fixes:
AICurlEasyRequestStateMachine didn't delete itself.
curl_multi_socket_action calls were made for potentional removed sockets.
The curl thread wasn't terminated.
2012-07-04 00:10:43 +02:00
Lirusaito
de26fff525 Changed "Mesh Detail" to "Level of Detail" so people don't see it as "Mesh"
Also added in an Advanced button, but it's commented out as it does not function properly, and someone else should code it..
Builds on the previous commit of graphics prefs..
2012-07-03 14:44:13 -04:00
Drake Arconis
9db7bcde00 Why or why ugly hack :/ 2012-07-03 17:33:37 +00:00
Lirusaito
ca9c99577f Removed exportFileXML, and importXML, updated indra/test's
and generally updated cpp's to V-D look(include order, spelling fixes, and whatnot)
Also, commented out pointless using namespace std.
2012-07-03 10:07:14 -04:00
Lirusaito
b0c28c5eb2 Updated Graphics Preferences, Fixed display resolution combobox not disappearing
Now includes Ambient Occlusion and looks more like V3,
and yay everything finally disappears that should nao~
2012-07-03 09:55:19 -04:00
Lirusaito
ded9d1027b Merge branch 'V2MultiWear' of git://github.com/siana/SingularityViewer into V2MultiWear 2012-07-03 08:44:10 -04:00
Aleric Inglewood
9b8e5c8719 Merge branch 'V2MultiWear' into curlthreading2
I picked a few non-curl related patches from curlthreading2
and applied them to V2MultiWear. Now merging back to avoid
collisions for others.
2012-07-03 14:27:12 +02:00
Siana Gearz
8a271b9621 HTTP texture fix - the brutal and inefficient way -.- 2012-07-03 13:40:32 +02:00
Siana Gearz
c5f9e8cf68 Revert "HTTP texture fetch endless append fix, by Laika Tungsten"
This reverts commit b4bdb7ca36.
2012-07-03 13:17:01 +02:00
Lirusaito
4e2af85770 Merge branch 'V2MultiWear' of git://github.com/siana/SingularityViewer into V2MultiWear
Conflicts:
	indra/llrender/llvertexbuffer.h
	indra/newview/llface.cpp
2012-07-03 01:57:55 -04:00
Siana Gearz
5a685febbf Certificate update 2012-07-03 07:51:03 +02:00
Siana Gearz
cd2dc2f3ca Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear
Conflicts:
	indra/llrender/llvertexbuffer.h
	indra/newview/app_settings/settings.xml
	indra/newview/llface.cpp
2012-07-03 07:49:22 +02:00
Lirusaito
9c61998dac Spelling fixes...
to a header *sigh*
2012-07-03 00:54:25 -04:00
Lirusaito
509340237c Merge branch 'AltCompilers' of https://bitbucket.org/LightDrake/singularityviewer into V2MultiWear 2012-07-03 00:51:43 -04:00
Drake Arconis
fc3436a8d1 *grumble* 2012-07-03 04:48:30 +00:00
Drake Arconis
41983b7f27 A bit of cleanup and fixes 2012-07-03 04:45:53 +00:00
Lirusaito
a9494d1fb0 Merge branch 'AltCompilers' of https://bitbucket.org/LightDrake/singularityviewer into V2MultiWear 2012-07-02 23:42:38 -04:00
Drake Arconis
608417ba6b Corrected line endings of XML files 2012-07-03 03:32:18 +00:00
Drake Arconis
c5d19cca0b Finished dead code patrol and cleaned up remnants of long dead feature 2012-07-03 03:31:24 +00:00
Lirusaito
4435e7ade3 Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear 2012-07-02 21:28:19 -04:00
Drake Arconis
f79a16ef0f Cleanup of long dead code 2012-07-03 01:10:41 +00:00
Drake Arconis
947990c2ad Merge remote-tracking branch 'aleric/V2MultiWear' into AltCompilers 2012-07-03 00:34:07 +00:00
Aleric Inglewood
e36042bb76 More that I forgot it extract from curlthreading2. 2012-07-03 02:33:09 +02:00
Drake Arconis
cb5474c291 Cleanup and simplication of cmake logic in 00-Common.cmake 2012-07-03 00:31:06 +00:00
Drake Arconis
77948b8ce4 Fixed further warnings reported by clang. 2012-07-03 00:24:15 +00:00
Drake Arconis
2ac4f81424 Prefer FmodEx as the default audio engine if the viewer was built with it. 2012-07-03 00:22:50 +00:00
Drake Arconis
7ad1b8731d Merge remote-tracking branch 'aleric/V2MultiWear' into AltCompilers 2012-07-02 21:25:40 +00:00
Aleric Inglewood
d66acdf240 Add the rest of sRunning too. 2012-07-02 23:22:42 +02:00
Drake Arconis
8eb319d3ba Merge remote-tracking branch 'aleric/V2MultiWear' into AltCompilers 2012-07-02 21:08:04 +00:00
Drake Arconis
d703b4e076 Further tweaking cmake 2012-07-02 21:04:53 +00:00