Commit Graph

79 Commits

Author SHA1 Message Date
Shyotl
382fc710e5 Disable octree statistics gathering. 2012-12-08 17:07:15 -06:00
Shyotl
794dbacea3 Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer.git into testpit
Conflicts:
	indra/newview/lldrawpoolavatar.cpp
	indra/newview/llviewertexturelist.cpp
	indra/newview/llworldmap.cpp
	indra/newview/pipeline.cpp
2012-11-29 11:54:41 -06:00
Shyotl
9a9b5ce61e LLRectBase<>::clipPointToRect could divide by zero, resulting in the resulting clampd values being invalid under some scenarios (worldmap panning could cause the mouse cursor to 'restore' to an invalid location upon mouseclick release.) 2012-11-18 02:48:55 -06:00
Shyotl
c2b26f6c15 GCC Fixes:
Only use C++0x/C++11 features if compiling for windows, or if GCC is configured to support such features (v4.7 onwards: '-std=c++11'. v4.3 through v4.6: '-std=c++0x')
Removed an assertion that's no longer possible to evaluate (queue doesn't support iterators).
2012-11-12 03:04:24 -06:00
Siana Gearz
303c74f4c9 Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
Conflicts:
	indra/llmessage/llurlrequest.cpp
	indra/newview/llvoavatar.cpp
2012-11-12 06:46:58 +01:00
Siana Gearz
59d4d833f1 Made octree check optional 2012-11-12 04:48:00 +01:00
Shyotl
3bbb23b1bc Experiments with allocating octree nodes via memory pools. 2012-11-05 16:58:03 -06:00
Shyotl
3ec1dbf51c Updated spatial partition and octrees to use std::vector. Also, added diagnostic spew to octrees. 2012-11-04 21:48:17 -06:00
Shyotl
43271f290e A few more alignment bits and bobs. 2012-10-16 20:07:04 -05:00
Shyotl
1b89e5c973 Dragged in a bunch of alignment fixes from LL. Should allow disabling of tcmalloc on windows/linux32 if such is ever implemented. 2012-10-16 02:33:05 -05:00
Lirusaito
d5c507ca6b Merge branch 'master' of https://github.com/LightDrake/SingularityViewer 2012-10-12 12:59:42 -04:00
Drake Arconis
5d5c3e2a48 LLCalcparser update 2012-10-04 17:56:43 -04:00
Shyotl
9bb9292a41 Attempt to catch octree node manipulation while iterating over said nodes 2012-09-19 15:34:25 -05:00
Siana Gearz
e379a5a03e Allow super thin objects on OpenSim 2012-09-04 12:37:22 +02:00
Drake Arconis
0be43cf1c2 Fixed GCC47 issues and fmodex copying 2012-08-09 10:56:29 -04:00
Shyotl
bf3e605d3b MAINT-646: Factor std::vector out of lloctree https://bitbucket.org/davep/viewer-development/changeset/efcec3eb374f 2012-07-18 01:03:54 -05:00
Shyotl
a56ad597d4 MAINT-646: Factor std::set out of lloctree https://bitbucket.org/davep/viewer-development/changeset/52b6c9168974 2012-07-18 00:54:52 -05:00
Drake Arconis
c464a8da30 Merge branch 'V2MultiWear' of bitbucket.org:Lirusaito/singularityviewer into AltCompilers
Conflicts:
	indra/cmake/00-Common.cmake
	indra/newview/llvovolume.cpp
2012-07-02 20:16:56 +00:00
Drake Arconis
ece9dda7b4 Initial support for the Clang compiler and numerous warning fixes 2012-07-02 19:45:41 +00:00
Lirusaito
24db228406 Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear
Conflicts:
	indra/llrender/llvertexbuffer.h
	indra/newview/llface.cpp
	indra/newview/llpaneleditwearable.h
2012-07-02 04:14:52 -04:00
Shyotl
67e1a3b004 Lindie viewer-dev catchup regarding rendering pipeline. 2012-06-30 20:05:31 -05:00
Lirusaito
0ad533d94d STORM-1870 and Have a space before old names in parentheses, like V3.
Also small fixes, some spelling, some important; synchronize with upstream a bit..
Jonathan Yap: STORM-1870 Avatar tracking beacon doesn't get disabled if DESTINATION_REACHED_RADIUS is reached
2012-06-09 17:07:20 -04:00
Lirusaito
58c58dc845 Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear 2012-05-23 03:46:48 -04:00
Shyotl
ae0804beea Trival V3 llmath merge. 2012-05-21 20:23:42 -05:00
Lirusaito
16c2235510 Fixed About Floater's background.
clear and transparent both refer to the same thing, code fix to reflect this.
2012-04-28 21:34:24 -04:00
Lirusaito
8e6063e7b9 Fixed compile errors for gcc4.7 (also reported by clang) 2012-04-28 21:29:52 -04:00
Shyotl
32c6365bf9 Octree tweakage. 2012-01-29 01:27:40 -06:00
Shyotl
fc65380f2a Added auto avatar muting(appearance only) based on avatar complexity (disabled by default). Added several missing debug views. 2012-01-27 02:36:26 -06:00
Shyotl
6374f012de new fasttimers, including ui. 2012-01-23 18:30:54 -06:00
Shyotl
c5024ff04d Stab in the dark at fixing color corruption on 64bit builds. 2012-01-22 21:45:10 -06:00
Shyotl
ad3a16fd3b Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer.git 2012-01-12 23:30:17 -06:00
Shyotl
55a66737c0 Disable a certain octree error that likes to fire a bit frequently. 2012-01-12 23:24:44 -06:00
Lirusaito
61beedd3d9 Changed style of comments with asterisks to avoid highlighting errors on //* with weak highlighters, change is to all files that could potentially break highlights
Most were needed, though some were just for possible problems with highlighting, should not affect performance whatsoever.
2012-01-09 05:40:03 -05:00
Shyotl
ffb285c6ff Huge renderer update (WIP). Still plenty to do, especially pertaining to UI.
-Nametag bubble visbility is oddly inconsistent. May vanish with future planned UI merges...
-VBOs are PAINFULLY slow on ATI hardware. This repos self-compiled davep/shining-fixes branch, so I'll leave the ball in LL's court for now regarding that.
2011-12-09 14:02:29 -06:00
Shyotl
dc3831c86b llmath v3 merge. 2011-11-23 23:04:54 -06:00
Shyotl
1cf367aae5 A little vectorization. gluProject replaced with vectorized glProjectf. Added LLMatrix4a::rotate4. Tweaked LLMatrix4a::rotate. Removed extra _mm_movehl_ps call in LLMatrix3a::setTranspose 2011-11-19 20:02:31 -06:00
Shyotl
30a95e7f45 Some cleanup. Using gAgentAvatarp in many places. Incl other misc small changes. 2011-10-03 22:45:13 -05:00
Shyotl
3c4f012480 LLVOVolume::lineSegmentIntersect crashfix. http://hg.secondlife.com/mesh-development/changeset/741175a108d1 2011-09-02 06:56:32 -05:00
Shyotl
fd317a4092 newview V3 partial merge. 2011-08-30 01:05:59 -05:00
Shyotl
60c122ee15 LLMath V3 partial merge. 2011-08-29 03:21:05 -05:00
Shyotl
48abb8280f SH-2188. Invalid VBO updates for rigged attachments. 2011-08-18 00:28:42 -05: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
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
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
dfa850931a Fleshed out llvolume a bit more. Added some utility functions. 2011-07-20 23:53:09 -05: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
ddb70568e1 And the new files required for it to actually work! Hurrr. 2011-07-20 06:25:22 -05:00