8eda31456a
fixing mac build error
2011-01-04 10:18:15 -08:00
350a736d37
Merge
2010-12-31 12:55:04 -08:00
d196348d0f
Physics stage of wizard
2010-12-31 12:53:39 -08:00
e3204165b9
automated merge
2010-12-30 22:09:16 -08:00
ca9df698db
Code review fix from davep - use booling or operator and not binary one
...
Remove unnecessary state check.
Initial dialog work for showing physics cost in upload dialog
2010-12-30 22:08:25 -08:00
f41b53059e
SH-508 Fix for frame stalls when adjusting skin weights.
2010-12-30 16:46:56 -06:00
13ec64e0e6
SH-714 Fix for skinned meshes being incorrectly scaled.
2010-12-30 16:07:18 -06:00
fad456e2b1
SH-647 Switch asserts to warnings in octree for development builds (were already warnings in release builds).
2010-12-29 16:29:34 -06:00
6262c4a427
SH-632 Fix for auto generating mesh LODs sometimes reducing High LOD triangle count.
2010-12-29 15:48:59 -06:00
842dcb7e42
automated merge
2010-12-29 13:16:36 -08:00
5f99331f4a
Automated merge up from viewer-development
2010-12-29 13:23:02 -05:00
ed365b9c0e
Automated merge from mesh-development
2010-12-29 13:07:32 -05:00
3c91317a2b
SH-652 Viewer crash when right-clicking an avatar while in edit mode
...
Null pointer issue.
2010-12-29 13:07:13 -05:00
087c105317
STORM-242 : pull into viewer-development
2010-12-28 13:21:58 -08:00
5b52a801c6
STORM-805 : pull into viewer-development
2010-12-28 13:19:43 -08:00
cc11129afb
STORM-682 : pull into viewer-development
2010-12-28 13:15:07 -08:00
e4336b63b6
STORM-242 ADDITIONAL_FIX One more build fix...
2010-12-28 19:01:57 +02:00
d790003055
STORM-242 ADDITIONAL_FIX Fixed release build and error handling.
2010-12-28 14:30:52 +02:00
76e70a0da6
Automated merge with file:///Users/oz/Work/viewer-development
2010-12-28 06:58:04 -05:00
0b74df6774
STORM-523 : pull into viewer-development
2010-12-27 21:21:01 -08:00
4d296c19e5
STORM-242 FIXED Fixed incorrect release notes URL in the "You just entered a region using a different server version" notification.
2010-12-27 21:47:06 +02:00
061c3a5ab6
VWR-20879: Allow find_vc_dir() to work with VCExpress
2010-12-27 12:18:19 +00:00
298a1d99fb
Fix another alignment issue on windows
2010-12-24 22:28:20 -08:00
f644ef0fb0
STORM-682 FIXED Fixed positioning notification toasts in mouse-look mode.
...
Toasts were positioned as if side tray was expanded.
The fix is to reshape the so-called toasts screen channel (an area where toasts are drawn)
on entering/leaving mouse-look mode, so that the screen channel can notice that side tray get in/visible.
2010-12-24 20:20:26 +02:00
265616ca02
STORM-682 WIP Removed unused code.
2010-12-24 18:53:45 +02:00
a9caa3151c
merge fix for storm-411
2010-12-24 09:08:20 -05:00
ef1c3aac88
merge fix for storm-784
2010-12-24 09:07:06 -05:00
14d830ca43
merge improved fix for STORM_785
2010-12-24 07:41:41 -05:00
0b4c2fa99e
Fix windows build break
2010-12-23 23:31:25 -08:00
5a4bb72b8d
Automated merge with ssh://bitbucket.org/aleric/viewer-development-aleric-export
2010-12-23 19:41:44 -05:00
2b979742f6
automated merge
2010-12-23 14:15:03 -08:00
57153cf0f1
SH-655 - Project mesh viewer crashes on exit.
...
A copy constructor was implemented which did a memcpy,
which included the vtable pointer which was to another object of another
class (same child though). This resulted in the wrong destructor
being called.
The reason for the memcpy was for alignment purposes.
The solution was to move to LLVector4a, which is intrinsicly aligned.
Also, did some performance optimizations based on the LLVector4a optimizations.
The solution was to re-implement the
2010-12-23 01:48:44 -08:00
49de8add83
STORM-810 : Auto update and related changes (integration request from team chopper)
2010-12-22 23:24:58 -08:00
f8325ac588
STORM-805 : add some printout to the log so we can trace the answer map-server-url at startup
2010-12-22 22:09:42 -08:00
8204145ab1
wizard xml tweaks
2010-12-22 18:00:40 -08:00
ae50a7cca2
Merge
2010-12-22 16:50:38 -08:00
b512865746
added open advanced floater link
2010-12-22 16:50:03 -08:00
c86d6a7bbb
STORM-808 : merge webkit upgrade to Qt v4.7.1
2010-12-22 14:06:46 -08:00
2651cfc271
merge
2010-12-22 15:19:58 -06:00
07d3480ec3
SH-658 Preserve LOD mode when switching between preview LoDs.
2010-12-22 15:18:55 -06:00
a86e35aa0d
Automated merge up from viewer-development
2010-12-22 13:02:36 -05:00
3aa7b9f83e
Automated merge with http://hg.secondlife.com/mesh-development
2010-12-22 10:56:27 -07:00
8ba0baa631
fix for SH-648: Crash on exit in LLViewerFetchedTexture (ref count error)
2010-12-22 10:55:48 -07:00
8de11e98cc
Automated merge from mesh-development
2010-12-22 12:49:54 -05:00
693b838b72
Merge
2010-12-22 03:16:23 -06:00
09ff90a118
Update llconvexdecomposition and fix gcc compiler error
2010-12-22 03:15:56 -06:00
f3d96660ed
Update llconvexdecompostion
2010-12-22 02:26:19 -06:00
171307ded9
merge
2010-12-22 01:05:52 -06:00
e1b1db9575
SH-636 Update physics tab to new spec, move "completed" physics decomp callbacks to main thread, add object model to decomposition tool, make imported model scales non-uniform.
2010-12-22 01:05:35 -06:00
6182ded4e9
SOCIAL-374 FIX (Windows) Avatar images not loading on join.secondlife.com in Webkit 4.7
...
Updated llqtwebkit build for Windows from changeset f8e31d21585d in the llqtwebkit repository.
2010-12-21 17:11:01 -08:00
leyla_linden