Aleric Inglewood
449e7b2a84
Merge remote-tracking branch 'origin/master'
2011-08-13 17:32:27 +02:00
Shyotl
88df625096
Occluding voidwater again, as not doing such drastically lowers peak framerates. (100+ to ~50 on my hardware)
2011-08-13 03:30:51 -05:00
Shyotl
3213170d32
featuretable fudgery
2011-08-12 19:20:22 -05:00
Shyotl
f551294e66
Alphamasking migrated to shaders instead of using fixed-function. Very early code. Hasn't even made it into viewer-development yet.
2011-08-12 19:20:11 -05:00
Fritigern Gothly
fb05f258e4
Windlight presets from Phoenix, and from LL v3.0
2011-08-13 02:04:48 +02:00
Fritigern Gothly
e1f89bf22e
Corrected a big DUH! and added a few OSSL functions that i have missed. Also made building no longer fail on warnings.
2011-08-12 23:04:27 +02:00
Fritigern Gothly
8aed7eb909
More OSSL additions which were committed today
2011-08-12 00:52:20 +02:00
Fritigern
f10aeaad31
Added the latest LSL and OSSL functions.
...
Signed-off-by: Fritigern Gothly <fritigerngothly@gmail.com >
2011-08-11 22:43:19 +02:00
Shyotl
8e1c70dcaa
Oopsies. Don't cast a LLStrider<> element to LLVector4a. The array itself is aligned, but not necessarily the individual elements(eg: if in strided/interleaved mode!)
2011-08-11 03:35:20 -05:00
Shyotl
8d242f24dd
LLWorld::getAvatars didn't make much sense. What's with that break in the old code? Anyhow, VOAvatar position should override regionlist, probably.
2011-08-11 03:17:55 -05:00
Shyotl
c9860f7b66
Massive deferred update...
...
Plus renamed setupViewport to setup[2|3]DViewport.
Migrated mWindowRect to mWindowRectRaw, mVirtualWindowRect to mWindowRectScaled.
Slowly updating getwindow/getworldview calls to new v2 variants as I run across them.
Cleaned up ascent-related code in llmanip.cpp.
Impostor update tweaks.
Edgepatch water occlusion changes. (no patch flickering on edges of screen while moving camera)
2011-08-11 03:16:17 -05:00
Player Dagostino
b65da876f7
Reindent comments from the previous commit.
2011-08-11 06:23:34 +02:00
Player Dagostino
4683fb4907
On Linux and in standalone mode, first look for SLVoice in the executable path list. If none is found then try to use the one installed with Singularity, if any. Useful for packagers who want to make many sl clients share the same voice program.
2011-08-11 06:19:59 +02:00
Player Dagostino
6ac2d342b3
Drop useless stuff about VBO and occlusion from the impostor patch.
2011-08-11 03:35:52 +02:00
Player Dagostino
4d2447d764
Enable the DSO workaround on linux only AND in standalone.
2011-08-11 02:12:28 +02:00
Siana Gearz
e6de1e0d5a
Merge branch 'future' of git://github.com/AlericInglewood/SingularityViewer into future
2011-08-11 00:55:22 +02:00
Siana Gearz
c6e0c2f323
This should fix the settings
2011-08-11 00:53:17 +02:00
Siana Gearz
06615a580e
Silly kitty me -.-
2011-08-11 00:51:09 +02:00
Siana Gearz
e9777f25a4
OSSL support by Fritigern, fixes #122
2011-08-10 23:57:43 +02:00
Siana Gearz
23c5d5dd48
Merge branch 'V2Mesh' of git://github.com/Shyotl/SingularityViewer into future
...
Conflicts:
indra/newview/lltexturefetch.cpp
2011-08-10 23:21:14 +02:00
Shyotl
ca328aec72
Replaced some opengl fixed functions with shaders. Temporary ShyotlUseLegacyRenderPath setting to debug if this change actually improves framerate at all (setting not tied to callbacks. Have to toggle shaders to have stuff pick up the setting change)
2011-08-10 03:53:49 -05:00
Shyotl
896b7146e7
Fixed vertex corruption if avatar shaders are off and jointmesh is not vectorized. Also, now preventing usage of unsupported vectorization paths.
2011-08-10 02:01:53 -05:00
Shyotl
c918384805
Tempfix for curl locking mutexes for too long
2011-08-09 20:57:16 -05:00
Shyotl
bff63ac682
Parammanagers are really not done well. Added manager-specific shader lists instead of just having them dig down the global list every update.
2011-08-09 04:30:35 -05:00
Shyotl
04ea6a967e
Removed dead code related to 'RenderForSelect'.
2011-08-09 02:11:10 -05:00
Shyotl
9bda97786f
Batch indexing/no-fixed-function WIP.
2011-08-09 01:11:05 -05:00
Siana Gearz
cdebc1c5cc
Version 1.5.10(2)
2011-08-09 03:57:57 +02:00
Aleric Inglewood
e95ee85804
Make LLFrameTimer thread-safe.
...
LLFrameTimer::sFrameTime is accessed by the texture
thread as well. Although the only consequences are
that it's possible for a timer in the texture thread
to time out too early (or to never time out when
it's started) when it reads this variable at the
same time as that it is updated, which is pretty
inlikely, it's just not-done to leave anything
thread-unsafe when it's known to be thread-unsafe.
This patch also adds a framework for AIFrameTimer, but
that isn't implemented yet.
2011-08-08 19:21:27 +02:00
Aleric Inglewood
5e69c9fa05
Merge remote-tracking branch 'origin/master'
2011-08-08 19:20:39 +02:00
Siana Gearz
3853d50eec
This should fix KV TVs
2011-08-08 02:40:26 +02:00
Siana Gearz
2cb0dedbd1
This should fix KV TVs
2011-08-08 02:39:29 +02:00
Siana Gearz
5f4328767b
Debug needs SSE2 now too
2011-08-07 22:40:36 +02:00
Siana Gearz
2e88db37ad
Signed warning in texture fetcher
2011-08-07 22:32:07 +02:00
Siana Gearz
ab41bf00c4
Merge branch 'V2Media' of git://github.com/Shyotl/SingularityViewer into future
2011-08-07 20:35:34 +02:00
Siana Gearz
1c6d890a5a
Correct, complete user profile path on Windows
2011-08-07 19:29:57 +02:00
Aleric Inglewood
3d1863c1b5
Make sure we assign name before mStatus
2011-08-07 18:47:01 +02:00
Shyotl
1e7415095c
mCurlGetRequest->process() kersploded. Debugger is being dumb, so adding an assertion for now.
2011-08-06 18:17:55 -05:00
Shyotl
a5f38565fa
Henri-inspired tweakage.
2011-08-06 18:14:54 -05:00
Aleric Inglewood
370890b704
We use is_main_thread() for this.
2011-08-06 13:45:01 +02:00
Shyotl
9aa26648c9
Added CurlUseMultipleThreads (requires restart to change)
2011-08-06 02:29:04 -05:00
Shyotl
f1759e0a96
Old-code related to sim-quota cleaned up.
2011-08-06 02:27:06 -05:00
Shyotl
f9bcbab5f3
Win compile fix. Including stdint.h explodes in vc2010, so #if'd it out for windows.
2011-08-05 21:39:43 -05:00
Shyotl
4dd888353d
Merge branch 'future' of git://github.com/siana/SingularityViewer.git into V2Mesh
2011-08-05 20:12:59 -05:00
Shyotl
550fa0a160
Merge branch 'future' of https://github.com/AlericInglewood/SingularityViewer.git into V2Mesh
...
Conflicts:
indra/newview/llspatialpartition.cpp
2011-08-05 19:40:35 -05:00
Shyotl
7bcd259821
Added ShyotlRenderVBOStrideMode to toggle between strided and unstrided VBOs.
2011-08-05 19:24:17 -05:00
Aleric Inglewood
5005f4aa1d
Never pass an empty string as directory path to the filepicker.
...
Should work around the problem as described in
http://code.google.com/p/singularity-viewer/issues/detail?id=117
2011-08-05 14:53:11 +02:00
Aleric Inglewood
7e7a238255
Merge remote-tracking branch 'origin/master'
2011-08-05 14:27:54 +02:00
Shyotl
9cc398e939
Occlusion now using LLVertexbuffer class.
2011-08-05 02:55:13 -05:00
Shyotl
b75a28ec15
Cleanup. Applied http://hg.secondlife.com/mesh-development/changeset/3031f266784a
2011-08-05 01:18:27 -05:00
Aleric Inglewood
881d065220
Wrap sGlobalRawMemory in AIThreadSafe.
...
This is accessed by different threads.
Other globals like it might also be
accessed by different threads, this has
to be investigated.
2011-08-05 00:05:08 +02:00
