Commit Graph

4067 Commits

Author SHA1 Message Date
Drake Arconis
5cc687f5dc Merge remote-tracking branch 'siana/master' into AltCompilers 2012-07-08 19:11:04 -04:00
Siana Gearz
e7f8206c96 Merge branch 'AltCompilers' 2012-07-09 00:22:44 +02:00
Lirusaito
6581cb2929 One more DARWIN fix.
Credit to LightDrake and Apelsin
2012-07-08 17:57:06 -04:00
Lirusaito
b8f7e193d6 Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear 2012-07-08 17:10:44 -04:00
Shyotl
95b0421074 Inviting avatar to group via profile now adds that avatar to subsequent group invitation popup more reliably. 2012-07-08 16:09:10 -05:00
Lirusaito
1228732432 Fix for compile error caused by compiler type not being defined on DARWIN.
and stop compiling dsa/dhparam, we don't use these.
2012-07-08 17:08:11 -04:00
Lirusaito
191787e5c3 Merge branch 'V2MultiWear' of git://github.com/siana/SingularityViewer into V2MultiWear 2012-07-08 11:28:47 -04:00
Lirusaito
ca07daebc7 Merge branch 'V2MultiWear' of git://github.com/AlericInglewood/SingularityViewer into V2MultiWear 2012-07-08 11:28:31 -04:00
Lirusaito
8ec8acf610 Added Build preferences, like Emerald's. Exposed UI for giving an item with autoresponse
Pulled LLDropTarget into its own files and brought in the callback version so we can use either, whereever we need them, without rewriting them.
This makes code for drag and drop items into boxes easier.

--------Auto-Response--------
Added item box to Adv. Chat, finally you can send autoresponse with item!
Taught to LLViewerMessage to understand this.

------------Build------------
Added in comment labels for more sections of system preferences.
Everything new in the System->Build tab will reset on cancel, except the item, I see no reason to reset an item.
Added in BuildPrefs, and settings like them.
Taught LLToolPlacer how to give creations material type, and size, and ask importtracker to do the rest.
LLViewerObjectList now pings importtracker whenever it notices newly created objects that are ours entirely, so we can exact our will upon them.
Cleaned up most of importtracker code so we can use only the parts we need, and do it well.
Added ObjectPhysicsProperties to message.xml
2012-07-08 11:20:56 -04:00
Drake Arconis
cb0f4f8f10 Added support for Intel c++ Composer Xe
Added support for building with Intel C++ Composer Xe
Fixed a warning thrown by it
2012-07-08 10:29:28 -04:00
Siana Gearz
e7a49da774 Correct the parting line between void water patches with shaders 2012-07-08 06:27:50 +02:00
Siana Gearz
81123a80f2 Merge branch 'AltCompilers' of bitbucket.org:LightDrake/singularityviewer into AltCompilers 2012-07-08 03:34:20 +02:00
Siana Gearz
045caad8f5 Revert "REVERT! Fix for media update commit."
This reverts commit 36a95ec36e.
2012-07-08 03:33:05 +02:00
Siana Gearz
a76a77a330 Merge branch 'V2MultiWear' into AltCompilers 2012-07-08 00:51:29 +02:00
Siana Gearz
81242f1b5e Merge branch 'V2MultiWear' of https://github.com/Shyotl/SingularityViewer into V2MultiWear 2012-07-08 00:34:38 +02:00
Siana Gearz
36a95ec36e REVERT! Fix for media update commit. 2012-07-08 00:31:18 +02:00
Aleric Inglewood
744563a150 Use a newer libcurl version for linux. 2012-07-07 23:22:48 +02:00
Aleric Inglewood
389074d1e9 Fail at configure time when openGL is not found 2012-07-07 23:17:22 +02:00
Aleric Inglewood
93778eccbb Compile fix for g++ 4.7 2012-07-07 18:29:55 +02:00
Aleric Inglewood
5637e89568 Fix for libcwd that is already in curlthreading2. 2012-07-07 14:49:37 +02:00
Drake Arconis
4508ea1cc1 Fixup from last commit
*grumble* Stupid git gui broke my commit!
Fixed a warning in llpaneleditwearables.cpp
2012-07-07 00:35:46 -04:00
Shyotl
2e073f7449 Fixed an annoying discard level assertion that was being fired. 2012-07-06 23:24:00 -05:00
Lirusaito
6b11776fcf Added in Phoenix's building preferences: removed bloat and waste, made positioning less fragile, repositioned parts more sensibly, and suggested courses of action in comments. 2012-07-06 14:45:39 -04:00
Lirusaito
58ff4a00f1 Some very good points Voodoo had, and some things I noticed and had to correct. 2012-07-06 12:14:55 -04: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
Drake Arconis
b40a9c7a06 Updated about floater
Moved the licensing to its own tab
Updated and added relevant copyright notices
2012-07-06 09:12:42 +00:00
Drake Arconis
0b757aaad5 Merge remote-tracking branch 'liru/V2MultiWear' into AltCompilers 2012-07-06 01:54:57 +00:00
Drake Arconis
7f1d9a01e6 Merge remote-tracking branch 'siana/AltCompilers' into AltCompilers 2012-07-06 00:04:07 +00:00
Aleric Inglewood
f46d8e8a10 Try to be smart about not printing garbage (binary) received from the server. 2012-07-05 23:50:03 +02:00
Siana Gearz
d1b6b78206 Fixing windows build 2012-07-05 22:38:24 +02:00
Drake Arconis
d8c191490f OK HAPPY? ITS FIXED
MY GOD RAGE RAGE RAGE RAGE RAGE AND MOAR RAGE
Yes I know this looks stupid.
Really.
2012-07-05 14:19:37 +00:00
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