Inusaito Sayori
5191baa659
Merge branch 'master' of https://bitbucket.org/Shyotl/singularityviewer-internal
...
Conflicts:
indra/newview/llnetmap.cpp - Thankies Shyotl~
2014-07-21 23:31:59 -04:00
Inusaito Sayori
bc8947289b
Sync
...
Includes:
MAINT-3541 (crash in std::vector >::reserve)
MAINT-3364 FIXED Call clearSelection() from root_folder
MAINT-3621 FIXED Set name to "Unnamed" if object's name consists of whitespaces.
MAINT-3412 add gpu_table line with distinct Intel Iris Pro OpenGL regex to match new MBP with forced Intel graphics
MAINT-3119 FIXED Return common chars for triggers that matches the prefix.
MAINT-3661 Fix for crash when uploading corrupt .dae file.
MAINT-3671 FIXED Rename title when new tab is added.
MAINT-3465 FIXED Add check mark to selected entry.
BUG-5537 FIX reverting breaking changes to pectorals and belly.
MAINT-535 FIXED The teleport SLAPP is changed to UNTRUSTED_THROTTLE. Confirmation dialog for teleporting via slapp is added.
2014-07-11 09:31:51 -04:00
Shyotl
24ca32f9f7
Replace gluProjectf/gluUnprojectf with own versions. Also changed gGLModelView/gGLProjection and other related matrices to LLMatrix4a.
2014-06-06 01:59:04 -05:00
Lirusaito
cb8cd702e1
[LLMeshRepo sync] Linux compile fixy
...
Note to self: Windows compiler does not care about file casing, be more careful.
2014-04-18 23:51:52 -04:00
Drake Arconis
f5bdb56a7c
Crash fixes in model upload
2014-03-01 18:53:51 -05:00
Latif Khalifa
d98402b13f
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
...
Conflicts:
indra/newview/llvotree.h
2013-10-10 00:03:36 +02:00
Shyotl
f25eb07fab
Unstaged changes cleanup. Further vectorization. Change in binormal/bitangent calculation.
2013-10-09 15:43:23 -05:00
Drake Arconis
01bba31c8d
Crash fixes to deal with janky FBX to DAE converters
2013-08-25 03:02:40 -04:00
Siana Gearz
0f90991533
OS X build fix
2013-05-28 03:24:12 +02:00
Shyotl
03272c8875
Clamp LLMeshSkinInfo::mJointNames to a max of 64 entries. Also checking size in lldrawpoolavatar(Redundant checks added to just match similar logic LLRiggedVolume::update more closely.)
2013-03-30 01:01:53 -05:00
Latif Khalifa
5c8e436401
Fix windows build: warnings management
2013-01-30 05:45:00 +01:00
Siana Gearz
d1de4d53fe
Merge branch 'meshupload' of git://github.com/LightDrake/SingularityViewer into meshupload
2013-01-13 20:37:04 +01:00
Commander Cupcake
c08c2a55e5
Revert changes that broke bump
2013-01-13 14:30:41 -05:00
Siana Gearz
5b0597ea47
Suppress 400 GCC warnings in Collada DOM headers
2013-01-13 06:27:02 +01:00
Siana Gearz
5f3ca7fda0
Linux64 support, integrated physics/decomposition
2013-01-13 03:23:56 +01:00
Drake Arconis
9c1237ca05
Initial work.
2013-01-06 03:59:38 -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
Drake Arconis
0d3fab40e5
Further header cleanup and a few updates
...
Updated llstring to current linden
Further linden_common cleanup
Header cleanup
Raised banlines to 5000 as per linden server change
Included missing llmediaentry.cpp file
Minor whitespace changes here and there
2012-07-21 03:01:42 -04: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
7f934f34f1
Minor renderer updates.
2011-09-23 00:55:24 -05:00
Shyotl
aaa6417fb7
Tweak related to cubemaps. Missed this earlier.
2011-08-29 03:22:42 -05:00
Shyotl
d2ae02a855
Slight cleanup. Also, index arrays are always non-strided, so now using vectorization.
2011-08-18 00:33:59 -05:00
Shyotl
978424ced0
Cleanup. Also made it so LLModel::setVolumeFaceData hopefully wont explode if it's ever utilized by future code.
2011-08-14 03:56:54 -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
b75a28ec15
Cleanup. Applied http://hg.secondlife.com/mesh-development/changeset/3031f266784a
2011-08-05 01:18:27 -05:00
Siana Gearz
6cfaecf972
GCC buildfixes
2011-08-01 20:42:06 +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
