Commit Graph

2808 Commits

Author SHA1 Message Date
Shyotl
c081efa460 LLVoiceClient::mNextAudioSession now initialized. 2011-07-30 20:28:34 -05:00
Aleric Inglewood
ba5caa6d51 Merge remote-tracking branch 'origin/master' 2011-07-30 23:37:50 +02: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
Aleric Inglewood
057a154a6d Minor documentation fixes. 2011-07-29 17:24:39 +02:00
TighMacFanatic
4b9ab10527 Merge branch 'master' of e:/SL_Dev/Siana
Conflicts:
	indra/newview/lltexturefetch.cpp
2011-07-26 11:46:14 -04: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
7e98a939fc commandhandler fixup. 2011-07-21 23:08:38 -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
Xara
d018bf99c7 Very, very very very very old bug from 2006, REGRESSION! Patch prevent console spam about failed locales set on systems where global locale is reported by "modern" way, I do not remember author, probably Tofu L. then others, not the better way (better is rewrite all this and fire such code OUT of loop!) 2011-07-19 22:25:50 -07:00
Shyotl
35e0b9b6ff Data-alignment. SSE intrinsics. 2011-07-19 21:35:35 -05:00
Shyotl
7a689f5ccb Drawable flag fixup. LLCalc cleanup on shutdown. 2011-07-19 20:18:43 -05:00
Shyotl
179c1bcc0c Octree capacites/radii/distances definable via settings. 2011-07-19 03:42:30 -05:00
Shyotl
25be08f236 Innitial commit. Did as much as I can for llmediactrl without diving too deep into llviewermedia 2011-07-18 04:21:36 -05:00
Shyotl
52570a7f61 Simplification of LLPrimitive::setVolume ala davep. Have had this for a while, I just never commited until now. Haven't noticed any misbehavior with this alteration, and I'm tired of it going uncommited. 2011-07-18 04:18:12 -05:00
Shyotl
fd35e86ddb Resolved some null calls regarding web media panel. 2011-07-18 03:31:18 -05:00
Shyotl
9e061d5e35 Apparently MacGL crashes on for loops of variable length. Also, cleaned up a few minor things. 2011-07-18 03:30:58 -05:00
Shyotl
3e9c23e43b Setting through LLView::userSetShape now done through LLView::setShape. LLView::snappedTo renamed to LLView::setSnappedTo. virtual overriding of LLView::userSetShape now done through LLView::handleReshape which LLView::setShape calls. 2011-07-17 19:59:30 -05:00
Shyotl
66336e8151 Now letting LLRenderTarget delete bound textures immediately instead of having them hang around until next frame. 2011-07-17 19:48:37 -05:00
Shyotl
330bf08c9b Telport history cleanup. I didn't need these static functions, so away they go. 2011-07-17 19:10:22 -05:00
TighMacFanatic
a8fb423e44 Fix compile warning due to signed/unsigned mistake. 2011-07-17 17:04:33 -04:00
Siana Gearz
5b072b030b Area computation fudging 2011-07-17 21:29:48 +02:00
Siana Gearz
5beccac1d2 This should make media less crashy 2011-07-17 19:32:36 +02:00
Shyotl
6ad9367c24 Trying out new LLCachedControl implementation. 2011-07-16 23:36:56 -05:00
Shyotl
5ec3795716 Resolved LLCachedControl type mismatch with a few settings. 2011-07-16 23:35:08 -05:00
Shyotl
2870d44824 Teleport history now saved to teleport_history.xml. TeleportHistoryMaxEntries specifies how many entries to allow in floater before old entries are dropped. 2011-07-16 23:32:01 -05:00
Shyotl
04ff884c5f About land, object list crashfix. http://code.google.com/p/singularity-viewer/issues/detail?id=71 2011-07-16 23:05:48 -05:00
Aleric Inglewood
b6d5743ccb Fix highlighting of Radar and Snapshot toolbar buttons.
Thanks to Done Arun.
2011-07-16 17:20:07 +02:00
Shyotl
f00038918c A few small insignifigant things from v2 llinventory 2011-07-15 02:35:37 -05:00
Shyotl
3fbfeb2de5 llmessage v2 merge. 2011-07-15 02:04:57 -05:00
Shyotl
7e0ee6bb71 Shiny new name cache. 2011-07-15 00:21:38 -05:00
Shyotl
ce064f5af2 Some safe merging with v2. 2011-07-14 01:35:15 -05:00
Shyotl
459f00ccb8 LLVOCache class implemented. 2011-07-13 04:35:38 -05:00
Shyotl
aa526e0314 Texture cache update. World-texures moved to local_assets directory. Removed many old unused ui textures. 2011-07-13 04:27:01 -05:00