Arrehn
7394730eaa
Merge up to LL FUI
2011-10-28 02:00:09 -04:00
Dave Parks
c0ca8e5e2e
Merge backout of b782a75c99e6
2011-10-14 11:58:35 -05:00
Dave Parks
4331c112ab
Backed out changeset b782a75c99e6
2011-10-14 11:52:40 -05:00
Brad Payne (Vir Linden)
4b269f67ea
merge
2011-09-14 14:54:20 -04:00
Brad Payne (Vir Linden)
b2853c1a74
merge
2011-09-13 12:11:11 -04:00
Leslie Linden
1c7b1532e9
Merge from viewer-experience
2011-09-08 10:55:48 -07:00
Brad Payne (Vir Linden)
08c0de785f
merge
2011-09-06 09:42:11 -04:00
Richard Linden
fc45e9cbf6
Automated merge with http://hg.secondlife.com/viewer-development
2011-09-02 20:24:06 -07:00
Xiaohong Bao
749d9ebadc
Merge
2011-08-31 10:48:56 -06:00
Xiaohong Bao
8cef480b96
fix for SH-2311: crash at LLVOVolume::lineSegmentIntersect line 3435
...
and SH-2358: Crash in LLError::crashAndLoop: Invalid face index
2011-08-29 18:15:38 -06:00
Leslie Linden
8961d10a2a
Merge from viewer-experience
2011-08-23 13:11:14 -07:00
Richard Nelson
56453f2982
EXP-1129 FIX SLURLs with only 2 coordinates are interpreted as center of sim
...
reviewed by Leslie
2011-08-22 13:16:58 -07:00
Leslie Linden
4b2ba7236f
Merge from viewer-experience
2011-08-22 11:41:18 -07:00
Nyx (Neal Orman)
9ed7cc297a
merging in latest mesh-development
2011-08-19 17:03:51 -04:00
Brad Payne (Vir Linden)
af8864c49c
merge
2011-08-19 09:41:50 -04:00
Nyx (Neal Orman)
cb09994ae2
merging in latest mesh-development
2011-08-18 19:17:34 -04:00
Oz Linden
7e5be23686
add proper license headers to files that did not have them
2011-08-17 14:43:39 -04:00
Dave Parks
f7d17cad5c
SH-2188 Fix for generally bad vertex buffer updates for rigged attachments and fix for viewer always thinking meshes initially have 8 texture entries.
2011-08-17 12:55:32 -05:00
Nyx (Neal Orman)
1f97cca856
merging latest mesh-development.
2011-08-16 17:52:25 -04:00
Dave Parks
5c0df02df5
SH-2147 Clarify and quiet log spam on mesh LoD unzip failure.
2011-08-15 12:18:06 -05:00
Nyx (Neal Orman)
402a2de765
merging latest viewer-mesh into nyx's sidebranch
2011-08-15 11:41:00 -04:00
Leyla Farazha
10ec004912
merge from viewer-experience
2011-08-12 14:53:25 -07:00
Nyx (Neal Orman)
60d15f78e1
merge with latest mesh-dev
2011-07-26 15:51:44 -04:00
Dave Parks
7ef1550fbb
merge
2011-07-18 23:50:50 -05:00
Xiaohong Bao
d951267467
Merge from viewer-development
2011-07-15 12:14:34 -06:00
Brad Payne (Vir Linden)
dd3069127b
merge
2011-07-13 14:57:23 -04:00
Oz Linden
44c7c6feaa
merge changes for storm-1315
2011-07-11 16:52:00 -04:00
Oz Linden
8529c37dee
merge changes for storm-1488
2011-07-11 06:16:19 -04:00
Don Kjer
b9d6b5ef9a
Merge viewer-development -> mesh-development
2011-07-08 18:25:07 -07:00
Brad Payne (Vir Linden)
7541e6e31b
SH-2014 FIX
2011-07-08 14:45:02 -04:00
Dave Parks
d50093cb42
SH-1926 Fix for blocking legitimate sculpt maps with over-eager area check.
2011-07-05 11:51:32 -05:00
Kadah_Coba
57c3051781
Changes for STORM-1315 LLCalc
...
Removed dynamic allocation on mVariables and mConstants
CS cleanup
2011-07-04 14:20:52 -07:00
Kadah_Coba
e08d1e510a
Additional functions for STORM-1315 Ability to do simple math in numeric edit fields
...
Support for floor, ceil, modulo.
Fixed ABS.
Added more constants, SQRT_TWO_PI and SQRT3
2011-06-30 13:48:07 -07:00
Kadah_Coba
c47d42d945
STORM-1315 Ability to do simple math in numeric edit fields
2011-06-29 23:40:20 -07:00
Xiaohong Bao
f83b08b69c
fix for SH-1878: Viewer hang in GLOD_Group::adaptTriangleBudget during LLModelPreview::genLODs;
...
SH-1891: viewer crashes while previewing "RYOMA 3D XML File.dae";
SH-1890: Crash loading palm tree
2011-06-24 15:09:10 -06:00
Nyx (Neal Orman)
7201d55396
BUILDFIX: linux build broken - abs() used instead of fabs()
...
linux caught the fact that we're using an integer absolute value function
when we should be using a floating-point version.
2011-06-20 17:18:43 -04:00
Dave Parks
15235061e8
SH-828 Fix for using uninitialized data when normals or texture coordinates are absent from collada file (can now upload meshes without normals or texture coordinates).
2011-06-18 01:02:03 -05:00
Dave Parks
91fe50ecc7
SH-1802 Fix for disappearing meshes under some circuimstances.
2011-06-09 17:03:53 -05:00
Dave Parks
75e366dd6f
merge
2011-06-09 00:29:37 -05:00
Dave Parks
b6e7d771da
SH-1696 Protect against sculpt triangle bombs by turning high-surface area sculpties into spheres.
2011-06-09 00:23:46 -05:00
Dave Parks
ca5a87b819
merge
2011-06-08 15:59:11 -05:00
Dave Parks
e135d4d629
SH-1767 Fix for crash when viewing assets uploaded by mesh-asset-deprecation viewers
2011-06-07 15:28:05 -05:00
Dave Parks
aa21ad59aa
Fix for crash when viewing asset with "NoGeometry"
2011-06-06 18:20:07 -05:00
Nyx (Neal Orman)
85b316e5df
BUILDFIX fixing crash on performance analysis when there is no variation
...
when fasttimers are amazingly consistent, we remove all data as outliers
instead of removing nothing. Probably something else going on here,
but this should fix the crash so we can analyze better.
2011-06-06 11:42:04 -04:00
Dave Parks
b77e027fcc
Remove some unused variables.
2011-06-02 23:46:26 -05:00
Dave Parks
de5f93ca52
SH-1732 Add streaming cost calculation for mesh objects.
2011-06-02 22:58:57 -05:00
Nicky
4455fdc6a2
Do not put pointers into the LLColor4U union. That messes everything up when compiling under 64 Bit
2011-09-12 21:51:02 +02:00
Tank_Master
c18fbbc187
implment old version of bitmap browser, work done by Vaalith Jinn
2011-09-06 10:49:48 -07:00
Liny
2923d413ef
EoL change, no code change
2011-09-01 18:08:44 -07:00
Liny
0c9649ca3b
EoL change, no code change
2011-09-01 13:38:52 -07:00