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

301 Commits (d0a51da8942c1908ecad3f718cf620dafd96c511)

Author SHA1 Message Date
Nicky d74467f64b More post-merge fixes for inventory changes. 2014-06-10 19:46:01 +02:00
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 5b846ed2a6 merge with release 2014-03-12 12:48:43 -07:00
Richard Linden 17e9c872ad Automated merge with http://bitbucket.org/lindenlab/viewer-release 2013-11-11 19:17:49 -08:00
Tank_Master 3603c4f992 Merge ll 3.6.11 2013-11-23 20:22:24 -08:00
simon 8eb56668fe SUN-69 MAINT-2258 : temp attachments getting removed improperly. Reviewed by Kelly. 2013-10-17 14:58:27 -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 a2a6bf20d7 merge with release 2013-06-20 16:46:23 -07:00
Richard Linden 0a96b47663 merge with viewer-release 2013-06-05 19:05:43 -07:00
Richard Linden 6b81b8629e Spring cleaning: removed unused .cpp and.h files, and cleaned up header dependencies 2013-05-05 17:45:35 -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
Nyx Linden 4bcf1b911a SH-4051 REVERT teen accounts unable to remove underclothes even when switching outfits 
Reverting fix as additional problems were found that could lead to even accidental nudity.
This fix is not required for the current release as it is not a regression.
Will review options for fixing for the next release.
 2013-04-03 19:04:57 -04:00
Brad Payne (Vir Linden) d1d0a2cf67 SH-4058 - log spam reduction initiative. 2013-04-03 14:58:33 -04:00
Nyx Linden 49731dd21d SH-4051 FIX problem with teen account and undershirt layers 
Updated logic for teen accounts, to ensure that during any transition
that they are wearing at least one undershirt wearable and one
underpants wearable.
 2013-04-02 12:51:45 -04:00
prep 8e3b190e91 merge 2013-03-11 15:17:13 -04:00
Brad Payne (Vir Linden) 72dfb2abce SH-3812 WIP, SH-3852 WIP - some metrics cleanup, added rebake when needed and sb system is unavailable, to avoid stale appearance problems 2013-02-13 17:28:05 -05:00
Brad Payne (Vir Linden) 99d197d021 SH-3852 WIP - track per-timer stats 2013-02-07 19:14:00 -05:00
Brad Payne (Vir Linden) 6a8947679c SH-3645 WIP - preserve item order after wearable save as 2013-01-16 11:34:42 -05:00
Tank_Master 718f6fa0ff merge LL 3.6.1 2013-07-10 00:23:23 -07:00
Kitty Barnett a9ffc0120a Merged with default tip (Revision 13149a524874) 
--HG--
branch : RLVa
 2013-05-06 23:54:58 +02:00
Kitty Barnett 9177903931 Merged with Appearance-MixedViewers tip 
--HG--
branch : .RLVa
 2013-04-29 15:39:42 +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 2721b080d6 Merged with viewer-sunshine tip (Revision 87a6fc812214) 
--HG--
branch : Appearance-Misc
 2013-02-20 13:33:23 +01:00
Kitty Barnett 1c6729856d - internal : minor clean-up of various attachment detaching code 
--HG--
branch : RLVa
 2013-02-14 00:08:30 +01:00
Kitty Barnett f43585ef5f - internal : selectively remove RLVa code from LLAgentWearables 
-> with server-side baking, everything should be based around COF contents rather than local bakes
    -> previous and current commit serve to provide an easy undo point

--HG--
branch : RLVa
 2013-02-13 20:44:09 +01:00
Kitty Barnett d895fc2497 - internal : restore RLVa code in LLAgentWearables 
--HG--
branch : RLVa
 2013-02-13 20:33: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 bdd663cebb - internal : reviewed Appearance-Misc patchset for viewer-sunshine 
--HG--
branch : Appearance-Misc
 2013-02-04 20:09:37 +01:00
Kitty Barnett 9722d20390 Merged with viewer-sunshine tip (Revision bd1162cb6fbe) 
--HG--
branch : Appearance-Misc
 2013-02-04 13:32:16 +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
Nyx (Neal Orman) f1d6052e36 SH-3264 Moved over a few more items to llappearance 
moved over:
isWearingWearableType
wearable::writeToAvatar
wearable::mTEMap (stores LocalTextureObject*)
more from wearable::import/export
wearable::createVisualParams, etc
 2012-09-11 11:59:45 -04:00
Don Kjer 85d0bcc063 Extracted mWearableDatas from LLAgentWearables into llappearance/LLWearableData. Moved LLDriverParam into llappearance 2012-09-06 02:53:55 +00:00
Don Kjer 403d1b6404 Merge VirLinden/sunshine -> don_linden/sunshine-experimental 2012-09-03 20:12:47 +00:00
Don Kjer 21c364c4d4 Renamed LLVOAvatarDefines to LLAvatarAppearanceDefines 2012-09-03 09:10:24 +00:00
Don Kjer c355fb98d3 Extracted texture baking system into llappearance library. 2012-09-03 06:12:50 +00:00
Brad Payne (Vir Linden) 40df1bba97 SH-3625 WIP - consolidating code paths for removal, removed dead code 2012-08-21 17:58:26 -04:00
Nyx (Neal Orman) e7a63cb356 SH-3310 WIP setting up architecture for switching texture baking on per-region basis 
Set up an architecture to minimize the use of the baked texture debug setting.
Instead concentrating on setting a per-region flag at the region handshake point.
This should be processed once the new regions are using the updated handshake.
The debug setting is being used in this one location as a placeholder.

Builds, but not fully tested/commented yet, passing this work off to Vir.
 2012-08-14 17:12:01 -04:00
Kitty Barnett c1783ada92 Merged with RLVa tip 
--HG--
branch : RLVa
 2012-08-12 18:03:18 +02:00
Kitty Barnett c59f33eee8 - fixed : having a wearable type remove locked but not add locked triggers assertions 
-> repro: @remoutfit:shoes=n while wearing shoes and then wear a shirt/jacket/... (or replace outfit)

--HG--
branch : RLVa
 2012-08-01 17:31:13 +02:00
Kitty Barnett 0a4364c103 - fixed : only one wearable of each type is worn when @addoutfit=n restricted during log-on 
-> repro: set "ForceInitialCOFDelay" to 60 seconds before logging in while wearing multiple wearables of the same type

--HG--
branch : RLVa
 2012-07-28 17:11:24 +02:00
Kitty Barnett 9c395aa0c6 Merged with default tip (Revision f958326781de) 
--HG--
branch : RLVa
 2012-07-16 01:01:09 +02:00
Kitty Barnett 2600777ece Merged with default tip (Revision f958326781de) 
--HG--
branch : Appearance-Misc
 2012-07-15 19:24:58 +02:00
Nyx (Neal Orman) 3f931ad1e3 SH-3229 FIX suppress baked texture cache requests and generated agentAppearance messages 
If you're using the new pipeline, then we should not be requesting cached baked textures
from the simulator. Nor should we be sending agentAppearance messages to the simulator
(note: this may change in the future on region arrive)
 2012-06-29 19:18:33 -04:00
simon@Simon-PC.lindenlab.com 1777fa5187 Merge pull from lindenlab/viewer-development as requested by Oz for DRTVWR-148 2012-05-25 15:07:22 -07:00
Brad Payne (Vir Linden) 681c5de92b SH-3128 FIX - log message cleanup for avatar rezzing 2012-05-02 16:48:09 -04:00