Commit Graph

1130 Commits

Author SHA1 Message Date
Shyotl
632a0b3e1f Merge branch 'master' into V2Renderer 2011-05-12 19:29:20 -05:00
Shyotl
8ac9da7bc8 Disabling buggy old occlusion tweak. Unstable on nVidia. 2011-05-12 19:03:59 -05:00
Shyotl
534e1ae733 DeferredHighPrecision test setting to test 16bit framebuffers vs 32bit 2011-05-12 18:59:05 -05:00
Shyotl
9e2db6bc40 General cleanup 2011-05-12 18:55:26 -05:00
Siana Gearz
0b25aa8ed5 Updated libpng (windows) and ogg/vorbis (all) 2011-05-13 01:01:59 +02:00
Shyotl
f45c3e2b1f Setting the correct variable on Physics LOD setting change sounds like a good idea. 2011-05-12 17:53:41 -05:00
Aleric Inglewood
3774547367 Redo the copyconstructor hack for AI*Access objects.
The previous hack wasn't thread-safe: read-only access would
access the reference counter multiple times at the same time,
which therefore would have to be thread-local to ever work.

The current solution just disables the calls to lock/unlock
for copyconstructed objects, which works if the copyconstructed
object isn't used anymore after the original is destructed.
This is the case then the copy construction only happens
upon passing a temporary to a function, which is the case.
2011-05-13 00:37:47 +02:00
Shyotl
2c1a46c70d A stability and leak fix regarding editing physics wearables. Thanks Henri! 2011-05-13 00:36:04 +02:00
Shyotl
b6446cad10 A stability and leak fix regarding editing physics wearables. Thanks Henri! 2011-05-12 16:13:04 -05:00
Siana Gearz
4d9e7fa8c1 Deferred settings 2011-05-12 22:10:10 +02:00
Siana Gearz
6d5d90bd92 Merge branch 'spamui' of git://github.com/TighMacFanatic/SingularityViewer 2011-05-12 15:16:17 +02:00
Shyotl
ba8e62841f Deferred class2 alpha shader should actually compile now. 2011-05-12 00:13:44 -05:00
Shyotl
d1d6994419 Full v2.6 renderer. 2011-05-12 00:13:38 -05:00
TighMacFanatic
f83c10208e Spam settings UI page 2011-05-12 00:39:06 -04:00
Siana Gearz
50310ba263 Merge git://github.com/Shyotl/SingularityViewer 2011-05-12 00:57:03 +02:00
Siana Gearz
b3847fdeed Build fixes 2011-05-11 23:06:49 +02:00
Siana Gearz
29feeccf0d Minimap fluke fix, thx Aleric 2011-05-11 23:06:19 +02:00
Siana Gearz
6b61e2dd2a Fix linkage in debug build on Windows 2011-05-11 12:47:24 +02:00
Shyotl
b61b0ca932 ShowLookAt now depth-tested 2011-05-10 13:52:59 -05:00
Siana Gearz
b81cfb2c4f Version 1.5.7(1) 2011-05-10 14:51:27 +02:00
Siana Gearz
eeeb44755a Make minimap not die on dead objects 2011-05-10 13:50:44 +02:00
Aleric Inglewood
fa51d52578 Workaround for gcc 4.2.x.
g++ 4.2 (and possibly earlier) apparently call a copy
constructor when passing a temporary to a function
that takes a const reference. Added code to allow
copy-constructing the AI*Access classes for this
compiler.

g++-4.2.x also bails out when it encounters files that
do not end on a newline. So, also added those where
they were missing.
2011-05-10 13:47:17 +02:00
TighMacFanatic
107c3cb70a Merge https://github.com/TighMacFanatic/SingularityViewer
Conflicts:
	indra/newview/CMakeLists.txt
	indra/newview/app_settings/settings.xml
2011-05-09 22:06:00 -04:00
Siana Gearz
8227efcaf1 Make our build and packaging shine again 2011-05-09 13:35:51 +02:00
Shyotl
005507c891 Merge branch 'master' of git://github.com/siana/SingularityViewer.git 2011-05-09 00:15:20 -05:00
Siana Gearz
2ca4d1bf64 Merge branch 'AlericMaster' of git://github.com/Shyotl/SingularityViewer 2011-05-09 00:49:21 +02:00
Siana Gearz
e371c2e93d Repo cleanup. Sheesh, who packaged pics with a lib? 2011-05-09 00:40:38 +02:00
Siana Gearz
8d2b56b1eb Fixed prebuilt fetching, Snowglobe style 2011-05-08 23:25:21 +02:00
Shyotl
2529644e90 Should now compile on VC100 again. 2011-05-08 16:25:03 -05:00
Shyotl
1a099167ae Fixing Win compile. (Partial) 2011-05-08 20:34:32 +02:00
Shyotl
0638fafe66 Fixing Win compile. (Partial) 2011-05-08 12:46:42 -05:00
Siana Gearz
e2e576e550 Merge git://github.com/AlericInglewood/SingularityViewer
Conflicts:
	indra/newview/skins/default/xui/en-us/mime_types.xml
2011-05-08 19:39:32 +02:00
Siana Gearz
7e75a897ca Release 1.5.7 2011-05-08 16:46:12 +02:00
Siana Gearz
de1a86004d This should fix media 2011-05-08 16:15:20 +02:00
Siana Gearz
205a11d44b Merge git://github.com/Shyotl/SingularityViewer 2011-05-08 14:46:28 +02:00
Shyotl
faf86fdf24 Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer.git into AlericMaster 2011-05-07 23:48:28 -05:00
Shyotl
c5917d79c7 Resetting media texture reference timer on update call to prevent purging from texture list while still in use. Keeping nullcheck just to be safe. (Broken video is preferable to a crash) 2011-05-07 21:49:48 -05:00
Siana Gearz
63b0bf0f30 New tcmalloc, just in case old one has VC10 bugs 2011-05-08 00:51:53 +02:00
Siana Gearz
82478d4ef2 Apparently some of those is needed on Windows, and it was shoddy 2011-05-08 00:51:00 +02:00
Shyotl
2a9e7ec5f7 Merge branch 'master' of git://github.com/siana/SingularityViewer.git 2011-05-07 17:24:36 -05:00
Shyotl
7e16e0624a Scare everyone with a big-arsed warning. Horray! 2011-05-07 01:41:28 -05:00
Siana Gearz
e3f9b4dbbe Help me keep track of VBOs 2011-05-07 05:47:13 +02:00
Siana Gearz
0903241b8f Merge git://github.com/Shyotl/SingularityViewer 2011-05-06 13:50:20 +02:00
Shyotl
779fe9cfaa General cleanup. Potential line-width inconsistency tweak. Wearable creation cleanup. 2011-05-06 00:20:41 -05:00
Siana Gearz
f052915f54 Fix name in grant/ungrant edit right. Issue 33 2011-05-06 04:34:32 +02:00
Aleric Inglewood
92696623e0 Start up crash of LLErrorThread due to corrupt map in CheckLevelMap
Wrapped gSettings and the global objects returned by Settings::get() and
Globals::get() in AIThreadSafe, forcing thread-safe access.

This solves the problem of possible corruption of the various LevelMap's
in LLError::Settings due to thread unsafe accesses.
2011-05-05 15:41:19 +02:00
Siana Gearz
e6db03054b Merge git://github.com/Shyotl/SingularityViewer 2011-05-05 03:28:55 +02:00
Siana Gearz
eedc1f79ec Resolve stray VC8 CRT dependency by updating libs 2011-05-05 03:20:54 +02:00
Shyotl
5b36f29b76 LLViewerObject::setPosition already calls updateDrawable. Removing extra updateDrawablecalls.
Referring to cam axis byref.
2011-05-04 19:56:55 -05:00
Shyotl
96f400eb4c LLViewerObjectList::mDeadObjects has no reason to be a std::map any longer. Converted to std::set as per v2. 2011-05-04 19:55:17 -05:00