Commit Graph

1482 Commits

Author SHA1 Message Date
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
87070be7e3 Merge branch 'master' of github-siana:siana/SingularityViewer into future 2011-08-03 01:01:00 +02: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
Siana Gearz
04b507d286 Merge branch 'future' of git://github.com/AlericInglewood/SingularityViewer into future 2011-08-02 01:14:28 +02:00
Siana Gearz
45c87257ed Debug build fixes, linux32 2011-08-02 01:13:53 +02:00
Aleric Inglewood
ef6737d0cd Shorten the time between freeing the lock and setting mStatus to STOPPED. 2011-08-02 00:05:14 +02:00
Aleric Inglewood
13be594651 Add proper locking around between threads shared variables and the calls to signal() and wait(). 2011-08-01 23:46:54 +02: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
5e9cec2cc5 LLTextParser now a singleton. 2011-07-31 19:09:47 -05:00
Shyotl
3c244e6df0 Added new setCommitCallback and setValidateCallback to LLUICtrl, using boost::signals2. Kept legacy variants for now since they are just used too frequently to remove right now. 2011-07-31 19:08:08 -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
e21c9637ae Added some glFlushes to lessen framestalls 2011-07-31 19:01:59 -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
4034c3464b Just making sure only one error thread is created. 2011-07-31 02:28:29 -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
Shyotl
cc19a4c2da Aligned strided vertexbuffers. 2011-07-20 23:54:16 -05:00
Shyotl
dfa850931a Fleshed out llvolume a bit more. Added some utility functions. 2011-07-20 23:53:09 -05:00
Shyotl
a399452d20 Null joint states are getting in the joint map somehow. Added assertions to hunt this down. 2011-07-20 23:52:23 -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
Siana Gearz
2dd733cbaa Merge branch 'master' into future 2011-07-20 22:12:14 +02:00
Shyotl
fe0cd9f702 Bugfixes. Should fix bizarre cam behavior and lighting issues on carved/hollowed prims. 2011-07-20 15:07:58 -05:00
Shyotl
f2f4542c63 Merge branch 'master' into V2Media 2011-07-20 06:57:27 -05:00
Shyotl
bc221a573e Merge branch 'master' into V2Mesh 2011-07-20 06:57:07 -05:00
Shyotl
0c82921504 Now tracking llcapabilitypovider.h. Dependency was dragged in a while ago when LLViewerRegion was updated to work with new object cache. 2011-07-20 06:45:24 -05:00
Shyotl
ddb70568e1 And the new files required for it to actually work! Hurrr. 2011-07-20 06:25:22 -05:00
Shyotl
a994df7265 A majority of vectorization done. Note that it's INCOMPLETE. LLVolumeFace and LLVertexBuffer haven't been updated, so it's very dirty(and buggy) at those transitions. Compiles on windoze. 2011-07-20 06:07:13 -05:00