0b4c2fa99e
Fix windows build break
2010-12-23 23:31:25 -08: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
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
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
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
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
ce595b5663
Merge
2010-12-21 17:02:25 -08:00
6175e8147f
fixed wizard model not previewing issues and added pan/zoom
2010-12-21 17:01:03 -08:00
8bca21e23b
SH-689 Fix build issue due to assert i llviewerassetstats
...
Changed assert to 50 since that's the new asset count. Added OTHER metrics for mesh and dummy asset types.
2010-12-21 15:04:25 -05:00
4e98895719
Automated merge up from viewer-development
2010-12-21 10:39:35 -05:00
e0d77c277a
Automated merge from mesh-development
2010-12-21 10:38:08 -05:00
e7f3f3bdbb
model upload wizard - added optimization and state changes
2010-12-20 17:32:05 -08:00
c75e8f61aa
Automated merge with https://hg.secondlife.com/mesh-development
2010-12-20 18:14:50 -05:00
e79bd15fe0
SH-68 WIP adding debug switch for performance testing
...
Adding functionality to a previously added debug switch. This will allow me
to have UI, etc turned off and thus not impact framerates when testing for
rendering features.
2010-12-20 18:14:44 -05:00
261ac32dda
merge
2010-12-20 17:14:51 -05:00
4bd6edc6b0
SH-682 FIX, SH-594 FIX - removed mFMP wrapper, added thread checking. Moved onIdle functions to llcallbacklist.
2010-12-20 17:11:34 -05:00
e9d21ba941
Fix for windows build. Reviewed by Nyx.
2010-12-20 15:09:15 -06:00
6a0e8fc13e
thread safety checking
2010-12-20 13:52:48 -05:00
9c97a200be
Merge - final pull of viewer-development.
2010-12-20 09:57:39 -08:00
c87142e5d7
Automated merge up from viewer-development
2010-12-20 12:44:56 -05:00
25eef545fd
merge fix for storm-412
2010-12-20 09:06:06 -05:00
81b5931146
merge fix for storm-801
2010-12-20 09:05:09 -05:00
46422ab953
merge fix for storm-796
2010-12-20 09:04:09 -05:00
1718ca48c2
STORM-511 FIXED Display tooltip for sender name on group notices.
...
Changes:
* Set tooltip for sender name.
* Overridden handleTooltip() for the tooltip to be of normal (yellow) color.
2010-12-18 20:17:36 +02:00
fa9cbe50fa
Merge STORM-796
2010-12-18 18:39:12 +02:00
3b97a200b8
STORM-796 ADDITIONAL_FIX Fixed Mac build.
2010-12-18 18:35:32 +02:00
b59dad36ba
STORM-412 FIXED Resident profile controls aren't reshaped on changing panel width
...
- Added parameters for text boxes to follow right side of panel
2010-12-18 14:00:47 +02:00
085a8b260d
STORM-801 FIXED Wrong checkbox label in panel preferences, advanced tab
...
- Corrected checkbox label
2010-12-18 12:18:03 +02:00
fa17e848a6
Automated merge with https://hg.secondlife.com/mesh-development
2010-12-17 16:19:15 -05:00
089f9d6d37
merging in fix for CTS-323 / SH-464
2010-12-17 16:06:32 -05:00
ac7fad4cd0
SH-558 Fix for crash in physics shape display.
2010-12-17 14:58:39 -06:00
db11a76d51
Merge from viewer-development post 2.4 release
2010-12-17 15:54:00 -05:00
4056ab8fbf
SH-506 Remove (now obsolete) streaming cost info display.
2010-12-17 14:45:47 -06:00
9a8dbb8520
SH-682 WIP: allow DEBUG_FAST_TIMER_THREADS to work when enabled
2010-12-17 14:13:07 -05:00
452d9d5e3d
Updated contributions.txt for STORM-799 and STORM-800
2010-12-17 15:15:10 +01:00
3c05ebd286
ESC-237 No static init of LLAtomics and move TFRequest out of unnamed namespace.
...
Linux startup crash appears to be due to static/global C++ init of LLAtomic
types. The initializer with explicit value makes some runtime calls and it
looks like these assume, at least on Linux, that apr_initialize() has been
called. So move the static POST count to a member and provide accessors
and increment/decrement. Command queue was built on a pointer to a class
in anonymous namespace and that's not quite valid. Made it a nested
class (really a nested forward declaration) while keeping the derived
classes in anonymous.
2010-12-16 16:42:26 -08:00
fb8ba15801
Automated merge with file:///Users/oz/Work/viewer-development
2010-12-16 17:51:35 -05:00
d4899435a0
Merge
2010-12-16 17:36:51 -05:00
95c33793a2
Merge new tag
2010-12-16 17:35:17 -05:00
8a6cb03992
Merge
2010-12-16 14:35:08 -08:00
2413789e10
Added tag 2.4.0-release for changeset 1ed382c6a08b
2010-12-16 14:26:24 -08:00
Roxie Linden