Commit Graph

239 Commits (d0a51da8942c1908ecad3f718cf620dafd96c511)

Author SHA1 Message Date
Tank_Master 6095a2072d more deprecated call fixes (llmsg -> LL_MSG() / llendl -> LL_ENDL) 2014-06-10 08:01:16 -07:00
Tank_Master 6babf8abd2 Merge LL 3.7.7 2014-06-09 11:29:57 -07:00
Richard Linden 5b846ed2a6 merge with release 2014-03-12 12:48:43 -07:00
simon 2ccebebece More memory cleanup of containers after DeletePairedPointer() usage. 2014-02-14 14:57:08 -08:00
Baker Linden a72e34a345 [MAINT-3555] Crash in LLPanel::~LLPanel() on shutdown
- Added clear() after DeletePointer() call to hopfully fix this...
2014-02-14 13:56:36 -08:00
simon 38915f119c More memory cleanup of containers after DeletePairedPointer() usage. 2014-02-14 14:57:08 -08:00
Baker Linden d7b902d575 [MAINT-3555] Crash in LLPanel::~LLPanel() on shutdown
- Added clear() after DeletePointer() call to hopfully fix this...
2014-02-14 13:56:36 -08:00
Richard Linden d4f3fe3c56 SH-4653 FIX Interesting: Viewer crashes while reading chat history 2013-12-10 12:50:23 -08:00
Richard Linden 7956b9e3e8 BUILDFIX: updated enum to match viewer-sunshine so I can get llappearance-utility
building for viewer-interesting
2013-11-09 00:01:52 -08:00
Richard Linden 697d2e720b renamed TimeBlock to BlockTimerStatHandle 2013-10-15 20:24:42 -07:00
Richard Linden 80dfbbaacd merge from viewer-release 2013-10-08 11:59:24 -07:00
Richard Linden cbe397ad13 changed fast timer over to using macro
another attempt to move mem stat into base class
2013-09-05 14:04:13 -07:00
Richard Linden 9f7bfa1c37 moved unit types out of LLUnits namespace, since they are prefixed 2013-08-15 00:02:23 -07:00
Richard Linden 26581404e4 BUILDFIX: added header for numeric_limits support on gcc
added convenience types for units F32Seconds, etc.
2013-08-14 11:51:49 -07:00
Richard Linden e340009fc5 second phase summer cleaning
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
Richard Linden a2e22732f1 Summer cleaning - removed a lot of llcommon dependencies to speed up build times
consolidated most indra-specific constants in llcommon under indra_constants.h
fixed issues with operations on mixed unit types (implicit and explicit)
made LL_INFOS() style macros variadic in order to subsume other logging methods
such as ll_infos
added optional tag output to error recorders
2013-07-30 19:13:45 -07:00
Richard Linden ffa7123bb5 SH-4299 FIX Interesting: High fps shown temporarily off scale in statistics console
added ability to force uniqueness of LLCopyOnWritePointer
converted more variables to units
added convenience function for unit constants
2013-06-28 20:45:20 -07:00
Richard Linden 9fd3af3c38 SH-3931 WIP Interesting: Add graphs to visualize scene load metrics
changed Units macros and argument order to make it more clear
optimized units for integer types
fixed merging of periodicrecordings...should eliminate duplicate entries in sceneloadmonitor history
2013-06-13 15:29:15 -07:00
Richard Linden 0a96b47663 merge with viewer-release 2013-06-05 19:05:43 -07:00
simon ee2fce8790 Merge downstream code and viewer-beta 2013-05-09 14:10:45 -07:00
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
Richard Linden ae028e7987 removed unused data structures 2013-04-11 19:08:57 -07:00
simon b42b789723 Merge in downstream code (chui fixes, materials) 2013-04-11 16:18:34 -07:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Richard Linden 68f9f656cd merge with viewer-release 2013-03-22 00:44:59 -07:00
simon 5dbb0a31da MAINT-2510 : Time can go backwards for viewer animation, assert fires.
Reviewed by Kelly
2013-03-20 11:37:11 -07:00
Simon Linden d5561a1ada Merge in viewer-beta to get CHUI code 2013-03-19 16:20:53 -07:00
Richard Linden 8de397b19e SH-3931 WIP Interesting: Add graphs to visualize scene load metrics
changed LLCriticalDamp to LLSmoothInterpolation and sped up interpolator lookup
improvements to stats display of llstatbar
added scene load stats floater accessed with ctrl|shift|2
2013-03-18 08:43:03 -07:00
Graham Madarasz 54d8249691 Fix mismerge losing rollback change 2013-03-14 06:56:23 -07:00
Graham Madarasz (Graham Linden) e8dfa28697 Rollback Maestro interp changes 2013-03-14 14:12:26 -07:00
prep 8e3b190e91 merge 2013-03-11 15:17:13 -04:00
prep e0c9174609 merge 2013-03-11 15:05:47 -04:00
prep 207d9fd767 Viewer-chui merge 2013-03-11 14:45:53 -04:00
Graham Madarasz (Graham) f061b2b90e Optimize interp code to elim hundreds of divides per frame and fix jitter bugs. 2013-03-08 15:31:37 -08:00
Merov Linden faae38daaa Pull merge from lindenlab/viewer-developement 2013-01-30 20:01:03 -08:00
Nyx Linden 11fe124ae9 merging in viewer-beta.
Most of the merge was clean, a couple conflicts.
Brought over a couple patches manually for llpolymesh.
2013-01-24 16:22:49 -05:00
Tank_Master 52d9b07503 Merge viewer-bear 2013-09-12 21:15:34 -07:00
Nicky 399cb60d4d Memory leak; delete mDeprecatedMotions. 2013-08-18 20:35:07 +02:00
Tank_Master d4640277d0 Merge LL 3.5.3 release. 2013-07-09 16:24:58 -07:00
Ansariel 77d8e43adf Synchronized LLCharacter with V3 2013-07-01 15:21:32 +02:00
Tank_Master 14001c54df Gastly CHUI merge pass 1, don't count on anything to work. 2013-06-26 12:14:54 -07:00
prep e0432f98ee SH-3563. Pull and merge from viewer-development. Modest code changes to fix alignment issue in llAppearance. 2012-11-28 16:36:34 -05:00
William Todd Stinson 67bc42a80a Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta. 2012-11-20 16:20:40 -08:00
Dave Parks 5d34ac552f Automated merge with https://bitbucket.org/lindenlab/viewer-development 2012-11-20 17:03:55 -06:00
Richard Linden c0224cc47a merge with viewer-development 2012-11-19 19:06:36 -08:00
Kelly Washington ace013d26c MAINT-1942 Increase maximum animation length from 30 seconds to 60 seconds
reviewed with Simon
2012-11-16 16:22:17 -08:00
Richard Linden 9d77e030d9 SH-3406 WIP convert fast timers to lltrace system
cleaning up build
moved most includes of windows.h to llwin32headers.h to disable min/max macros, etc
streamlined Time class and consolidated functionality in BlockTimer class
llfasttimer is no longer included via llstring.h, so had to add it manually in several places
2012-11-14 23:52:27 -08:00
William Todd Stinson c9044c03b3 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta. 2012-11-09 18:51:23 -08:00
William Todd Stinson c4eaaa3d6a CHUI-484: Updating the code to rather than refer to it as Busy Mode, it now refers to it as Do Not Disturb mode. 2012-11-08 12:35:15 -08:00
Brad Payne (Vir Linden) f5a4c277cb SH-3500 FIX - added additional logging to allow params in various locations to be distinguished 2012-11-07 15:28:38 -05:00