Siana Gearz
c84e145557
Merge branch 'future' of https://github.com/Shyotl/SingularityViewer
...
Conflicts:
indra/llrender/llrendertarget.cpp
indra/newview/lloverlaybar.cpp
2012-08-09 02:11:14 +02:00
Siana Gearz
de74443d76
Merge branch 'master' of https://github.com/Shyotl/SingularityViewer
...
Conflicts:
indra/newview/llvovolume.cpp
indra/newview/skins/default/xui/fr/panel_overlaybar.xml
2012-08-09 00:42:23 +02:00
Siana Gearz
f3e7340118
Merge branch 'shycurl' of github.com:singularity-viewer/SingularityViewer
...
Conflicts:
indra/llmessage/llhttpclient.cpp
indra/llmessage/llhttpclient.h
indra/llmessage/llurlrequest.cpp
indra/llmessage/llurlrequest.h
2012-08-09 00:02:50 +02:00
Siana Gearz
96a4e16a4b
Don't feed empty, non-working callback to CURL
2012-08-07 18:21:36 +02:00
Siana Gearz
68ad5411c9
Shyotl's old llcurl
2012-08-07 13:13:45 +02:00
Shyotl
1a6c00ca8b
Display pathfinding attributes in build floater.
2012-08-06 12:26:28 -05:00
Shyotl
58033d3cbc
Added rebake navmesh button. Brought in rest of the underlying navmesh implementation.
2012-08-06 10:11:12 -05:00
Shyotl
b847c53395
Implemented basic 'awareness' of objects flagged as permanent.
2012-08-04 20:46:51 -05:00
Shyotl
aca3e8f6c4
Cleanup. Removal of dead code. Added/renamed object flag accessors.
2012-08-04 18:18:22 -05:00
Shyotl
7122a7c174
Added sim console.
2012-08-04 13:43:32 -05:00
Shyotl
d2b13f515d
Avoid several excessive per-frame LLView::getChildView calls by instead caching the results in postBuild. (Added CachedUICtrl, which is basically just a self-nulling pointer to not have to make ui ctors dirtier)
2012-08-03 20:51:53 -05:00
Shyotl
1d1947c51a
Reworked LLPostProcess and implemented FBO support (much faster if multiple post shaders are enabled, or need a lot of passes).
...
Tweaked LLRenderTarget to support depth textures if FBO support is lacking.
Prefer LLRenderTarget::getFBO() over LLRenderTarget::sUseFBO when determining how to handle a specific LLRenderTarget object. (Decoupling to simplify logic without having to track a global)
2012-07-29 04:28:11 -05:00
Siana Gearz
6ed9a62501
Disable texture auditing at start-up
2012-07-28 16:56:19 +02:00
Shyotl
701230b49c
Added LLRenderTarget::resize and did a little cleanup.
2012-07-26 03:05:22 -05:00
Shyotl
726d8248c5
Trying alpha-face rebuild using LL's method.
2012-07-26 00:17:38 -05:00
Shyotl
eeea2b4de4
Don't batch faces that are animating, ever (hopefully). Should fix texture animations breaking when rendermaxtextureindex > 1
2012-07-24 20:18:35 -05:00
Siana Gearz
89be317a00
Fix measurement tool
2012-07-23 14:18:45 +02:00
Siana Gearz
1ad4597d7a
Fix alpha flicker when Show Updates is enabled
2012-07-23 12:00:33 +02:00
Siana Gearz
c65b659538
Dirty potential mesh crash fix
2012-07-23 10:50:05 +02:00
Siana Gearz
3c23163a29
Less intrusive notifications, by Tazy Scientist
2012-07-23 09:54:00 +02:00
Siana Gearz
c3900ee4f3
Merge branch 'AltCompilers' of git://github.com/LightDrake/SingularityViewer
...
Conflicts:
indra/newview/llvieweraudio.cpp
2012-07-23 09:03:17 +02:00
Siana Gearz
9c5da9e42c
Build fixes VC10
2012-07-23 08:13:13 +02:00
Siana Gearz
179f04739d
Merge commit 'c7bdaf66329b018159c834d75fcc3d807b188ccb'
2012-07-23 05:10:56 +02:00
Siana Gearz
b2f513caae
Safer settings, EOL fix
2012-07-23 04:02:20 +02:00
Siana Gearz
9c1e74b0c0
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
...
Conflicts:
indra/llaudio/llstreamingaudio_fmodex.cpp
indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
2012-07-23 03:04:33 +02:00
Siana Gearz
d9cb2ce6c7
Looks like a bit of edit crash fix got missed, thx Drake
2012-07-22 23:30:41 +02:00
Siana Gearz
a967f2b037
Updated 'Show Updates'
2012-07-22 22:36:40 +02:00
Siana Gearz
db5a7578c9
Crash fix copy texture params
2012-07-22 21:44:41 +02:00
Shyotl
32f407340f
Call LLImageGL::initClass to avoid crash when calling LLFeatureManager::applyRecommendedSettings. (texauditing vectors must be allocated)
2012-07-21 21:16:41 -05:00
Shyotl
a1e714dce7
mDeferredVB only needs allocated when rendering in deferred mode. mCubeVB only needs allocated when occlusion is working. Let them be lazy-allocated on an as-needed basis.
2012-07-21 03:43:30 -05:00
Drake Arconis
0d3fab40e5
Further header cleanup and a few updates
...
Updated llstring to current linden
Further linden_common cleanup
Header cleanup
Raised banlines to 5000 as per linden server change
Included missing llmediaentry.cpp file
Minor whitespace changes here and there
2012-07-21 03:01:42 -04:00
Shyotl
9642780bb8
Merge branch 'master' into future
...
Conflicts:
indra/llaudio/llstreamingaudio_fmodex.cpp
indra/llaudio/llstreamingaudio_fmodex.h
2012-07-20 12:07:10 -05:00
Shyotl
73bc656e63
Flexis were not being reliably initialized before being drawn.
2012-07-20 12:04:24 -05:00
Shyotl
b8b235df09
And suddeny the texture index attrib(for batching) is now an integer! (Changing switch to an if block on nividia hardware seems like the real solution to pink textures... not the index datatype)
2012-07-20 12:03:41 -05:00
Shyotl
7b23aece00
Missed a couple LLCullResult::drawable_list_t -> LLCullResult::drawable_iterator replacements, albeit in #if'd out code blocks.
2012-07-20 11:37:01 -05:00
Shyotl
531af998fb
MAINT-775: Fix for particle index pool corruption on teleport. (And removed alternative workaround) https://bitbucket.org/davep/viewer-development/changeset/04fdf7945708
2012-07-20 11:29:11 -05:00
Lirusaito
c7bdaf6632
Merge branch 'AltCompilers' of https://github.com/LightDrake/SingularityViewer
2012-07-20 10:50:40 -04:00
Lirusaito
92c7792e95
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
...
Conflicts:
indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml - Resolved to the eye's pleasure.
2012-07-20 10:41:25 -04:00
Shyotl
c9e0a6c533
MAINT-1270: Fix for some flexi prims becoming flat at some LoDs. https://bitbucket.org/davep/viewer-development/changeset/47f0d08ba7ad
2012-07-20 08:55:02 -05:00
Shyotl
6331267df6
MAINT-646: Optimize LLVolumeImplFlexible::doIdleUpdate() https://bitbucket.org/davep/viewer-development/changeset/b0148737d316
2012-07-20 08:54:25 -05:00
Drake Arconis
1e81966b89
Clean up and updates
...
Cleaned up header bloatyness in linden_common
Moved around things to be in line with Linden Lab
Updated llinitparam and imported its new dependencies
Removed dohexeditor and related files
Removed unused legacy files
/\_..._/\
|/ \_/ \|
| o.-.o |
\ ( O ) /
/'--U--'\
| .:. | /\
| /:;:\ |` /
Drake | |:;:| |-'
Arconis / |'-'| \
`""` `""`
2012-07-20 08:13:07 -04:00
Shyotl
b785b9d219
Added 'Transparent Water' checkbox to graphics panel, as we actually have space for it now.
2012-07-20 05:15:47 -05:00
Shyotl
85da7163a7
Changing the rolloff settings now immediately apply (with fmodex). Also added AudioLevelUnderwaterRolloff now that the underwater rolloff 3d setting doesnt immediately get clobbered. Also, divvied up sound channels into channelgroups if using the fmod profiler, so it actually has useful info to show now.
2012-07-20 04:00:02 -05:00
Lirusaito
f3f8bee83b
Remove old spam stuffs, Clean up new spam stuffs to compile, UI new spam stuffs.
2012-07-19 23:40:07 -04:00
Ruby
6673c89791
Add Antispam code from NaCl (Chalice Yao)
...
Amended by: Lirusaito <inusaito@gmail.com >
2012-07-19 16:36:39 -04:00
Lirusaito
15af410e6f
Fix typo in outbox icon name, when closed.
2012-07-19 14:02:11 -04:00
Lirusaito
32e2b584b9
Translation Fix
2012-07-19 02:12:51 -04:00
Lirusaito
72fbb3f63e
Merge branch 'master' of https://github.com/DamianZhaoying/SingularityViewer
2012-07-18 22:58:52 -04:00
Lirusaito
c84f080fc8
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2012-07-18 22:08:06 -04:00
Shyotl
5fcdbfdd9e
FMODEx diagnostics.
...
SHFMODExStreamBufferSize added. Determines stream buffer size in ms. (stream restart required)
SHFMODExDecodeBufferSize added. Determines decode buffer size in ms. (stream restart required)
Streams will mute themselves if they are starving, until they are free of starvation for 5 full seconds.
Streams that fail to accumulate any buffer progress while starving for 10 full updates will be stopped.
Stream buffer progress(buffer percent) is llinfos spewed every update. (temporary)
Doubled default stream buffer size
Increased default decode buffer size to 1000ms (from 400)
Temporarily using FMOD::Memory_Initialize to display raw stream/decode buffer sizes via llinfos.
Added llwarns messages for SigmaTel hardware or bad audio acceleration configuration.
2012-07-18 21:05:24 -05:00