livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
41,851 Commits
2 Branches
0 Tags
301 MiB
Commit Graph

69 Commits (d0a51da8942c1908ecad3f718cf620dafd96c511)

Author SHA1 Message Date
Tank_Master 8863d9beaf Compile fixes 2014-06-09 23:27:05 -07:00
Tank_Master 6babf8abd2 Merge LL 3.7.7 2014-06-09 11:29:57 -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
Graham Madarasz 025c890958 Merge vwr-dev-mat 2013-05-01 08:11:15 -07:00
Graham Madarasz 806d09b114 Merge 3.5.1 into Materials 2013-04-30 19:50:05 -07:00
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
prep 207d9fd767 Viewer-chui merge 2013-03-11 14:45:53 -04:00
Brad Payne (Vir Linden) 99d197d021 SH-3852 WIP - track per-timer stats 2013-02-07 19:14:00 -05:00
Tank_Master 718f6fa0ff merge LL 3.6.1 2013-07-10 00:23:23 -07:00
Tank_Master d4640277d0 Merge LL 3.5.3 release. 2013-07-09 16:24:58 -07:00
Kitty Barnett a9ffc0120a Merged with default tip (Revision 13149a524874) 
--HG--
branch : RLVa
 2013-05-06 23:54:58 +02:00
Kitty Barnett feccd2ba6a Merged with default tip (Revision 13149a524874) 
--HG--
branch : Appearance-MixedViewers
 2013-04-29 15:33:37 +02:00
Kitty Barnett 4101c43f5f Merged with viewer-sunshine tip (Revision 87a6fc812214) 
--HG--
branch : RLVa
 2013-02-20 19:25:10 +01:00
Kitty Barnett e1526c4048 Merged with Appearance-Misc tip 
--HG--
branch : .RLVa
 2013-02-20 14:26:21 +01:00
Kitty Barnett f1a10d659d Merged with viewer-sunshine tip (Revision 87a6fc812214) 
--HG--
branch : Appearance-MixedViewers
 2013-02-20 13:34:21 +01:00
Kitty Barnett e1b955226d Merged with viewer-sunshine tip (Revision bd1162cb6fbe) 
--HG--
branch : RLVa
 2013-02-11 23:04:05 +01:00
Kitty Barnett b368a21202 Merged with Appearance-Misc tip 
--HG--
branch : .RLVa
 2013-02-04 21:06:34 +01:00
Kitty Barnett 72d81f739e Merged with viewer-sunshine tip (Revision bd1162cb6fbe) 
--HG--
branch : Appearance-MixedViewers
 2012-12-19 00:09:20 +01:00
Brad Payne (Vir Linden) 0777f53e2f SH-3606 WIP - replaced several LLInventoryCallback subclasses with boost::func equivalents 2012-12-10 14:47:17 -05:00
Richard Linden 4285cc271e CHUI-217 FIX Items are not visible in Merchant Outbox 
cleaned up a lot custom code for folder view item creation in inbox and outbox
proper initialization of views from inventory panel starting folder
 2012-07-30 15:15:42 -07:00
Kitty Barnett 9c395aa0c6 Merged with default tip (Revision f958326781de) 
--HG--
branch : RLVa
 2012-07-16 01:01:09 +02:00
Kitty Barnett 6c65ae35b4 Merged with Appearance-Misc tip 
--HG--
branch : .RLVa
 2012-07-15 19:46:56 +02:00
Kitty Barnett 7672a4795d Merged with default tip (Revision 4d9106153407) 
--HG--
branch : Appearance-MixedViewers
 2012-06-23 18:56:57 +02:00
Brad Payne (Vir Linden) 7fbf42dec8 Move phase tracking to its own set of classes inside LLViewerStats - simplifies llvoavatar and allows adding such tracking to classes that live outside the avatar lifetime 2012-04-19 14:52:44 -04:00
Kitty Barnett 6c71e11b2f Merged with Appearance-Misc tip 
--HG--
branch : .RLVa
 2012-04-17 21:44:48 +02:00
Kitty Barnett 8008ca8a05 Merged with default tip (Revision 10f58582b62f) 
--HG--
branch : Appearance-MixedViewers
 2012-03-11 00:32:34 +01:00
Brad Payne (Vir Linden) 7bc698cbec SH-2970 WIP - more phase tracking 2012-03-08 17:07:23 -05:00
Kitty Barnett ddc6afdd81 Merged with default tip (Revision f8183e357a6f) 
--HG--
branch : RLVa
 2012-04-21 22:29:42 +02:00
Vadim ProductEngine 36aba26615 EXP-1843 WIP Added an option to output avatar rez timing. 
Use the new "Avatar Rez" debugging tag to see the output.
 2012-02-03 11:10:13 +02:00
Xiaohong Bao 1410893276 fix for SH-2829: [crashhunters] Crash in LLWearable::importFile()/LLOverrideBakedTextureUpdate::LLOverrideBakedTextureUpdate() 2012-01-05 21:26:06 -07:00
Kitty Barnett 34c2718847 Merged with .RLVa tip 
--HG--
branch : RLVa
 2011-11-04 12:30:02 +01:00
Kitty Barnett d917a01d10 - fixed : stray comment marker after latest merge with Appearance-MixedViewers 
--HG--
branch : .RLVa
 2011-11-04 12:29:05 +01:00
Kitty Barnett caee90cf4c Merged with default tip (Revision f2e17425d895) 
--HG--
branch : RLVa
 2011-11-04 11:46:25 +01:00
Kitty Barnett 9b5ccd0342 Merged with Appearance-MixedViewers tip 
--HG--
branch : .RLVa
 2011-11-03 12:51:25 +01:00
Kitty Barnett f9a14adf91 - internal : reviewed for SL-3.0 
--HG--
branch : Appearance-MixedViewers
 2011-10-04 10:56:54 +02:00
Kitty Barnett 082584937b - added : "VerifyInitialWearables" setting to toggle the viewer 1 initial wearable compatibility check 
--HG--
branch : Appearance-MixedViewers
 2011-09-10 01:39:55 +02:00
Kitty Barnett a713ffa247 Merged with default tip (Revision ddfc2ed6aee1) 
--HG--
branch : RLVa
 2011-05-25 13:37:12 +02:00
Kitty Barnett ac47040f86 - internal : reviewed for SL-2.6.0 
--HG--
branch : Appearance-MixedViewers
 2011-04-14 19:13:11 +02:00
Kitty Barnett 604345b918 Merged with .RLVa tip 
--HG--
branch : RLVa
 2011-02-19 01:12:23 +01:00
Kitty Barnett 53446a6c7b - internal : reviewed for SL-2.5.0 
--HG--
branch : Appearance-MixedViewers
 2011-01-13 16:26:40 +01:00
Kitty Barnett a96238b59e - internal : added "ForceInitialCOFDelay" setting to simulate a delay between logging on and the point where the COF contents are fetched and processed 
--HG--
branch : RLVa
 2010-12-15 12:59:13 +01:00
Kitty Barnett a0f8962f26 [Appearance/MixedViewers] 
- review : reviewed for SL-2.2.0

--HG--
branch : Appearance-MixedViewers
 2010-09-22 19:36:41 +02:00
Kitty Barnett 4b28e88299 merge of Viewer-Build 
--HG--
branch : Appearance-MixedViewers
 2010-09-02 22:11:40 +02:00
Kitty Barnett a24668392e [Appearance/MixedViewers] 
- fixed : "Worn items in Viewer 2 and Viewer 1.x aren't synchronized" (http://jira.secondlife.com/browse/VWR-17594)
    -> current fix compares *only* the wearables in COF with the wearables specified by AgentWearablesUpdate
- fixed : minor memory leak in LLInitialWearablesFetch::processWearablesMessage()

--HG--
branch : Appearance-MixedViewers
 2010-08-28 19:52:16 +02:00
Vadim Savchuk 75a66a146b EXT-8727 FIXED Potential fix for a crash in LLAppearanceMgr::updateClothingOrderingInfo. 
I couldn't reproduce the problem (it has happened for only two users, both running MacOSX),
but from what I see in the logs, it might have been caused by (or related to) NULL COF items.
I haven't found out how they appear nor what exactly causes the crash, but just for any
case I added a check to make sure we don't try to update wearables ordering info for such items.

Reviewed by Sergey Litovchuk at https://codereview.productengine.com/secondlife/r/876/

--HG--
branch : product-engine
 2010-08-26 18:59:08 +03:00
Tofu Linden e416840f85 Backed out changeset c3d41f18ce2b 
back-out the back-out for this branch.  yay.
 2010-08-24 19:22:00 +01:00
Tofu Linden 98cc236503 Backed out changeset a62bf7c0af21 
Backing out this merge that I pushed (prematurely) to the wrong place.
 2010-08-24 18:44:39 +01:00
Tofu Linden 6ba23344c9 merge heads. whew. 2010-08-24 18:37:53 +01:00