Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,503 Commits 20 Branches 51 Tags
6aff0002fa8b10959de0b90148e19e15da48cbb1
Commit Graph

1212 Commits

Author SHA1 Message Date
Siana Gearz
6aff0002fa Merge branch 'future' of github-siana:siana/SingularityViewer into future 2011-08-18 19:26: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
Siana Gearz
2cb0dedbd1 This should fix KV TVs 2011-08-08 02:39:29 +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
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
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
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
Siana Gearz
fc839cb2ff This should fix the settings 2011-08-04 22:44:25 +02:00
Siana Gearz
174a33beb3 Variable size region support, by RevolutionSmythe 2011-08-04 22:20:25 +02:00
Shyotl
2c489d7741 Cleaned up polymesh (mesh vectors/normals size match VBO vectors/normals size to allow memcpy). Prep for vbo testing. 2011-08-04 01:38:56 -05:00
Siana Gearz
87070be7e3 Merge branch 'master' of github-siana:siana/SingularityViewer into future 2011-08-03 01:01:00 +02:00
Shyotl
4f8186b17e Debug symbols for llcommon.dll on windows. 2011-08-02 16:21:44 -05:00
Siana Gearz
82fc160abe Look and criticize, Aleric 2011-08-02 02:16:31 +02:00
Siana Gearz
3b97a575d1 Merge branch 'V2Mesh' of https://github.com/Shyotl/SingularityViewer into future 2011-08-02 01:25:46 +02:00
Shyotl
f5915ab83c Some fixes and cleanup for strided vbos. Added LLStrider::assignArray to clean up some loops, as well as replace LLVector4a::memcpyNonAliased16. Works with both unstrided and strided vbo elements, and alignment padding (LLVec4->LLVec3,etc) 2011-08-01 18:19:08 -05:00
Aleric Inglewood
313e008f61 Compile fixes to compile LL_DEBUG, and missing header (for linux?) 2011-08-01 23:33:56 +02:00
Siana Gearz
6cfaecf972 GCC buildfixes 2011-08-01 20:42:06 +02:00
Siana Gearz
aa469d860f Merge branch 'V2Mesh' of https://github.com/Shyotl/SingularityViewer into future 2011-08-01 19:56:33 +02:00
Siana Gearz
fcd37f3a45 Linuxy fixes 2011-08-01 19:55:57 +02:00
Shyotl
0bd444de5f A few more rigging related things added in. Also fixed vertex weights 2011-08-01 03:53:25 -05:00
Shyotl
2aa4aa78e2 Added physics settings to object features panel. Brought in mesh 'prim cost' fetching and now display cost in edit floater if mesh is enabled. 2011-08-01 01:33:07 -05:00
Shyotl
17bb0799e0 Added LLAgentUI. Includes improved buildLocationString. 2011-07-31 19:05:53 -05:00
Shyotl
40d644e432 Object edit subpanel now recognizes meshes and disables stitching and block-type dropdowns. 2011-07-31 19:03:25 -05:00
Shyotl
fd50e54a7d Fixed rigged shaders not loading under certain scenarios. 2011-07-31 19:00:58 -05:00
Shyotl
28568add4c Threaded cURL. Consider experimental (what in this branch isn't?), however it drastically reduces hitching for me... so yup. 2011-07-31 02:53:26 -05:00
Shyotl
d397513840 Fixed a mesh-related fasttimer. A freaking \t snuck in. Also, this old fasttimer class is really annoying to maintain. 2011-07-31 02:52:15 -05:00
Shyotl
62d0be964d Updated LLThread and LLMutex[Base] to prevent nested mutex locks in same thread from hardlocking. 2011-07-31 01:51:43 -05:00
Shyotl
b258b71e07 Flipped the MESH_ENABLED switch. Added missing components and updated stuff to be closer to mesh-development head. 2011-07-30 20:30:07 -05:00
Shyotl
c081efa460 LLVoiceClient::mNextAudioSession now initialized. 2011-07-30 20:28:34 -05:00
Shyotl
a237cb9cad llmemory.h cleanup. pulled llpointer, refcounter, smartpointer, singleton and safe handle out into their own headers. llmemory.h drags all those headers in for legacy support until everything else is cleaned up. getCurrentRSS() moved into LLMemory. getWorkingSetSize() added to LLMemory. 2011-07-29 20:40:08 -05:00
Siana Gearz
ee9b689cb4 OK, more login unbreaking =.= 2011-07-26 06:49:33 +02:00
Siana Gearz
5314f76803 Version 1.5.10(1) 2011-07-26 04:16:47 +02:00
Siana Gearz
2f571a0393 Signed cleanup on texture fetch and one login bug fix 2011-07-26 01:46:53 +02:00
Siana Gearz
dece627991 Merge git://github.com/AlericInglewood/SingularityViewer 2011-07-24 18:19:30 +02:00
Shyotl
1e92e734d8 Bulk of mesh. Excluded via #if MESH_ENABLED. LLModel still needs updated for strided vbos, Collada SDK needs to be wrangled, and misc pieces need to be found and brought over. Skipping inventory stuff until meshes are at least displayable. 2011-07-23 03:26:30 -05:00
Shyotl
179193d173 Some minor cleanup. Bringing stuff in-line with current to ensure it all works before mesh is actually plugged in. 2011-07-23 03:24:10 -05:00
Shyotl
07c892480a Vectorized llvolumeface while maintining strided vertexbuffers. 2011-07-22 04:29:19 -05:00
Shyotl
48ef9904c1 A pass at cleaning up LLVertexBuffer a bit. Also removing extra unbinds that caused synchronization issues with mapped vbos. 2011-07-21 01:48:46 -05:00
Siana Gearz
f30c284063 Merge branch 'V2Mesh' of https://github.com/Shyotl/SingularityViewer into future 
Conflicts:
	indra/llvfs/lldiriterator.cpp
	indra/newview/app_settings/settings.xml
	indra/newview/llviewerregion.cpp
 2011-07-21 00:20:06 +02:00