4176606cd6
FIRE-14972/FIRE-14589: Fix for memory corruption.
2015-09-10 00:59:20 +02:00
9ab07f8836
Mem-leak fixes and more by Drake Arconis (Alchemy Viewer)
2015-09-09 22:52:35 +02:00
006190f2a1
Merge with tools update.
2015-05-05 13:09:27 +02:00
23711c9275
Rename llround(..) to ll_round(..) because of a collision with MS llround (long long round) in VS2013
2014-12-10 08:44:08 -08:00
f405da4f31
Update to build on Xcode 6.0: interesting typo? no one to ask but pretty sure this is the fix ,-Wlogical-not-parentheses]
2014-10-17 15:23:28 -07:00
6095a2072d
more deprecated call fixes (llmsg -> LL_MSG() / llendl -> LL_ENDL)
2014-06-10 08:01:16 -07:00
6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
5b846ed2a6
merge with release
2014-03-12 12:48:43 -07:00
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
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
80dfbbaacd
merge from viewer-release
2013-10-08 11:59:24 -07:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
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
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
ee2fce8790
Merge downstream code and viewer-beta
2013-05-09 14:10:45 -07:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
5dbb0a31da
MAINT-2510 : Time can go backwards for viewer animation, assert fires.
...
Reviewed by Kelly
2013-03-20 11:37:11 -07:00
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
e8dfa28697
Rollback Maestro interp changes
2013-03-14 14:12:26 -07:00
f061b2b90e
Optimize interp code to elim hundreds of divides per frame and fix jitter bugs.
2013-03-08 15:31:37 -08:00
52d9b07503
Merge viewer-bear
2013-09-12 21:15:34 -07:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
6042f4d140
FIRE-8144; Fir for logout crash when using already deleted objects.
2013-03-12 20:02:57 +01:00
9b5cc28e76
Refactor code. All nd*.cpp/h files are now in their own subdirectory.
2013-01-27 18:53:56 +01:00
d6ebfd7c73
Handle invalid/corrupt VFS files in animation loading.
2013-01-02 18:59:42 +01:00
1fc009104e
FIRE-5385; Make sure deleteing animation data does not cause memory corruption.
2012-11-23 13:59:32 +01:00
be269caf6e
Crrash-fix (debug/releasewithdebinfo): update times <0 in LLKeyframeMotion::onUpdate.
2012-05-18 00:36:14 +02:00
e802a67564
Be more aggressive about cleaning out old keyframemotions.
2012-02-04 21:35:48 +01:00
a57a393bb9
Crashfix for SEC-906
2011-06-28 17:39:34 -07:00
e0695e88cd
FIRE-141, Joint Motion GC, by Nicky Dasmijn
2011-10-02 16:00:25 -04:00
4a0a10d9c6
Crashfix for SEC-906 (Aura Linden)
2011-07-01 00:21:33 -07:00
8c90748ad8
Crash fix
2011-06-28 14:57:15 -07:00
45defdc6c5
Potential crash fix
2011-06-28 01:19:40 -07:00
a5619d16f7
correct licenses (fix problem with license change merge)
2010-10-13 07:24:37 -04:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
838dbb9b0f
EXT-8304 FIXED [crashhunters] crash in LLKeyframeMotion::deserialize
...
Speculative bunch of robustification.
Reviewed by Soft.
2010-08-05 16:26:39 +01:00
2f012dd34f
merge
2010-08-25 14:48:18 -05:00
2fea1d5d33
Integrate SIMD API from oreh/server-trunk-oreh
2010-08-19 12:25:15 -05:00
15247f0869
Backed out changeset: 58571b4e704b
2010-07-27 14:22:14 -07:00
5d85dad85f
Reverted changeset 2bb10eae42bf
2010-07-15 12:31:08 -07:00
efb72e66d0
SNOW-484/DEV-51808 FIXED Recursive animations can crash viewer
2010-07-12 17:54:02 +01:00
55ea80076b
EXT-6422 Infinite loop in LLMotionController::activateMotionInstance
...
reviewed by monroe
2010-04-09 14:30:15 -07:00
cc92525b0d
QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3
...
svn merge -r118927:118939
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.0-merge-2-combo-QAR-1476
this is a composite of...
svn merge -r115088:118182
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-23
conflicts resolved:
C doc/contributions.txt
C indra/llaudio/audioengine.cpp
C indra/newview/CMakeLists.txt
C indra/newview/llfloaterlandholdings.cpp
C indra/newview/llpaneldirbrowser.cpp
C indra/newview/llpanelgrouplandmoney.cpp
C indra/newview/llpreviewscript.cpp
C indra/newview/llviewermenu.cpp
C indra/newview/skins/default/xui/en-us/notifications.xml
and...
svn merge -r116937:118673
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
minor-to-trivial conflicts resolved:
C indra/llcommon/llversionserver.h
C indra/newsim/llrezdata.cpp
C indra/newsim/llstate.cpp
C indra/upgrade/schema_version/sequence/3/index_log_paypal.sql
2009-05-04 17:43:26 +00:00
b01c75cb42
svn merge -r117314:117337
...
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1
QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge
2009-04-16 23:45:35 +00:00
e3cf284388
Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2009-01-08 00:05:06 +00:00
80be4c1d2d
QAR-767 Combined maint-render-7 and maint-viewer-9 merge
...
merge release@93398 viewer-merge-1@94007 -> release
dataserver-is-deprecated
2008-08-12 17:29:50 +00:00
926ea0b39a
QAR-669 1.20 Viewer RC11
...
QAR-648 1.20 Viewer RC10
merge Branch_1-20-Viewer-2 -r 88724:90511 -> release
2008-06-27 21:02:01 +00:00
25c10ed028
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
...
dataserver-is-deprecated
2008-06-26 00:39:00 +00:00
3855896097
EFFECTIVE MERGES:
...
svn merge -r 79616:82632 svn+ssh://svn/svn/linden/branches/maintenance/maintenance-7 into release
svn merge -r 83211:87215 svn+ssh://svn/svn/linden/branches/php-framework-3 into release
ACTUAL MERGE: svn merge -r 87631:87698 svn+ssh://svn/svn/linden/qa/combo-merge-maintenance-7-php-framework-3 into release
dataserver-is-deprecated
2008-05-19 17:02:33 +00:00
d273ba2ce2
Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated
2008-05-07 20:48:38 +00:00
Nicky