Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,587 Commits 20 Branches 51 Tags
1101b4075a4507b969d0f30dae0f19e80155dc9f
Commit Graph

2587 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Drake Arconis
1101b4075a Merge remote-tracking branch 'siana/master' into AltCompilers 2012-07-10 14:16:24 -04:00
Drake Arconis
edb144bd1d Fixed ugly workaround for compiler detection 
Corrected ugly workaround for compiler detection in code with
correct definition in llpreprocessor.h and updated various #if
to reflect this.
 2012-07-10 14:15:59 -04:00
Drake Arconis
bcefad1a97 Massive windlight preset cleanup and updates 
Cleaned up all duplicate windlight presets
Renamed windlight presets under correct current prefixes
Imported new presets from FS and Alchemy
 2012-07-10 14:14:31 -04:00
Siana Gearz
fe65e19b67 Fix wind on multichannel systems v1.7.0 1.7.0 2012-07-10 15:08:20 +02:00
Siana Gearz
1b6ef97f45 Windows build fix 2012-07-10 14:55:16 +02:00
Siana Gearz
ce0e0a2d38 Fix editing artifact from about floater fudging 2012-07-10 14:17:18 +02:00
Siana Gearz
e7aeffc271 Our trusty perftools 2012-07-10 14:11:02 +02:00
Lirusaito
648766ad44 Merge branch 'master' of git://github.com/siana/SingularityViewer into V2MultiWear 2012-07-10 03:40:09 -04:00
Lirusaito
176c91097a Renamed DisableWindAudio to MuteWind and made it actually work 
This will give Windows(only?) users experiencing the problem with wind sound corruption a way out.
 2012-07-10 00:52:02 -04:00
Siana Gearz
515b1488c6 Bumping the cache version 2012-07-10 06:14:07 +02:00
Siana Gearz
6868e2f7c1 Merge branch 'V2MultiWear' of https://github.com/Shyotl/SingularityViewer 2012-07-10 06:07:56 +02:00
Siana Gearz
c71c7ca7cc Make defaults less rude to others 2012-07-10 05:50:47 +02:00
Siana Gearz
2f743fe2ce About floater fixup, new contributors! 2012-07-10 05:36:07 +02:00
Siana Gearz
b19c284eb7 Make void water subdivision tunable 2012-07-10 05:34:50 +02:00
Siana Gearz
18638cd47c Fix assertion on shutdown if haven't logged in 2012-07-10 00:55:26 +02:00
Lirusaito
23e6c9c9e8 Revert "One more DARWIN fix." 
This reverts commit 6581cb2929.
 2012-07-09 18:49:27 -04:00
Lirusaito
fa9c48a376 Merge branch 'AltCompilers' of https://bitbucket.org/LightDrake/singularityviewer into V2MultiWear 
Conflicts:
	indra/cmake/00-Common.cmake
 2012-07-09 18:45:00 -04:00
Drake Arconis
a67fe755cd Fixed line endings 
Fixed the line endings of the windlight files to unix
 2012-07-09 12:32:34 -04:00
Lirusaito
80e44fe414 Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear 2012-07-08 20:05:17 -04:00
Shyotl
42c7a30280 Attempt to dodge some known vbo issues (VAO quriks, and VBO mapping being wonky). Will investigate the issues further, soon. 2012-07-08 19:04:33 -05:00
Shyotl
e9ec04a449 Added french translations for several recently added LLTrans string lookups. 2012-07-08 18:45:05 -05:00
Drake Arconis
f7d9cd1b8e Fixed jsoncpp 2012-07-08 19:33:44 -04:00
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
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
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