Commit Graph

1434 Commits

Author SHA1 Message Date
Siana Gearz
fcd37f3a45 Linuxy fixes 2011-08-01 19:55:57 +02: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
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
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
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
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
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
Shyotl
684484fd76 Added some missing settings and removed a bajillion old unused settings. 2011-07-13 04:01:12 -05:00
Shyotl
7fa2a62103 Renamed vivox icons from nonsensical uuids to something readable, as per v2. 2011-07-13 03:59:37 -05:00
Shyotl
e2112fa8d5 No change, just comments for stuff to avoid merging in, for now. 2011-07-13 03:56:05 -05:00
Shyotl
4753d65076 V2 llvfs merge 2011-07-13 03:53:12 -05:00
Siana Gearz
ecbb40b092 Whoops, deleted one too many 2011-07-13 10:35:36 +02:00
Siana Gearz
0fa9eef4b2 Double setting cleanup 2011-07-13 08:49:05 +02:00
Siana Gearz
144d96f78c Fixfudgery 2011-07-13 05:42:52 +02:00
Siana Gearz
3e84087d50 Modified fasttimer view, by Henri 2011-07-13 04:39:42 +02:00
Siana Gearz
2430c189fa Version 1.5.10(0) 2011-07-12 23:56:03 +02:00
Shyotl
4f8f24921f Aleric is right. This makes no sense. Don't bring this from v2, cuz it's wrong. 2011-07-12 15:35:35 -05:00
Siana Gearz
bad84aa608 Merge branch 'master' of git://github.com/siana/SingularityViewer 2011-07-12 21:40:02 +02:00
Siana Gearz
317b8d4ca1 OSX build changes 2011-07-12 21:39:51 +02:00
Shyotl
f93bcae65b Removed some frequent llinfos/llwarns spam. 2011-07-12 03:44:26 -05:00
Shyotl
8fde48bcb2 Abort fetch of null folders. 2011-07-12 03:39:41 -05:00
Shyotl
cae99f6cc8 Datapacker potentially leaking buffers? 2011-07-12 03:38:23 -05:00
Siana Gearz
cf81a4457e This fixes exporter 2011-07-12 04:23:48 +02:00
Siana Gearz
379f4c63ec Zeus has been begging for this 2011-07-11 12:05:53 +02:00
Siana Gearz
62780b0787 llOwnerSay particles interfere with CCS 2011-07-11 04:14:24 +02:00
Shyotl
c320429f41 Hack hackity hack... I mean fixed water-fog sign-error when cam approaches 0 z when using shaders. 2011-07-11 03:30:28 +02:00
Siana Gearz
47b7fdb5e0 LightShare compatible WindLight reset fix, not fully tested 2011-07-11 03:27:59 +02:00
Shyotl
e80cff77f0 Hack hackity hack... I mean fixed water-fog sign-error when cam approaches 0 z when using shaders. 2011-07-10 19:38:43 -05:00