Commit Graph

117 Commits (680194deaf7a35caaa629abc16e886d71baff636)

Author SHA1 Message Date
simon d760a6889d Merge downstream code 2014-06-18 19:02:25 -07:00
Brad Payne (Vir Linden) 487ca1bad3 v-r -> s-e merge WIP 2014-05-14 17:50:59 -04:00
Brad Payne (Vir Linden) 7b9708a2e3 sunshine-external merge WIP 2014-05-13 10:02:26 -04:00
simon a5568f942b Merge downstream version 3.7.8 code 2014-05-07 15:28:13 -07:00
andreylproductengine 6bbb86811e MAINT-3842 FIXED Using "Close Window" (Ctrl + W) shortcut while in Appearance mode doesn't visually revert any changes... 2014-03-21 04:55:55 +02:00
Mnikolenko ProductEngine 9670f19cc3 MAINT-1190 FIXED Update visual param list when changing sex. 2014-03-20 11:37:20 +02:00
Brad Payne (Vir Linden) d9e3a2948a merge 2014-03-12 17:24:07 -04:00
Richard Linden 5b846ed2a6 merge with release 2014-03-12 12:48:43 -07:00
maksymsproductengine 1033c9d67f MAINT-3555 crash in LLPanel::~LLPanel() on shutdown:
- memory leaks fixing;
2014-02-05 20:45:09 +02:00
maksymsproductengine e6c85c46c4 MAINT-3555 crash in LLPanel::~LLPanel() on shutdown:
- memory leaks fixing;
2014-02-05 20:45:09 +02:00
Brad Payne (Vir Linden) 39900843c9 SH-3455 WIP 2013-09-26 16:24:25 -04:00
Brad Payne (Vir Linden) 9a8afee83f SH-3455 WIP - removing bake upload code 2013-09-19 17:52:58 -04:00
Brad Payne (Vir Linden) 82f147367f SH-3455 WIP - removing bake upload code 2013-09-19 11:10:59 -04:00
Brad Payne (Vir Linden) 2157cf5e71 SH-4422 FIX - fixed some recently introduced issues with link description fields, which among other things reduces the number of appearance requests sent. 2013-08-14 14:25:22 -04: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
Don Kjer 3ed3b88892 Refactoring link creation calls in preparation for adding AIS v3 hook. 2013-08-09 13:36:36 -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
Brad Payne (Vir Linden) 3d8d4227f1 SH-3889 WIP - added callbacks to control ordering of operations after wearable save. 2013-07-19 17:22:53 -04: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
Brad Payne (Vir Linden) d73588eadd SH-4128 WIP - misc cleanup 2013-04-24 18:38:40 -04:00
Brad Payne (Vir Linden) eb88e4d378 SH-4128 WIP - cleanup around item link removal and callbacks 2013-04-24 18:08:20 -04: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 8e3b190e91 merge 2013-03-11 15:17:13 -04:00
prep 2e94202686 Removed deprecated calls to incrementCofVersion 2013-03-04 13:14:35 -05:00
Richard Linden 83eda3f152 Automated merge with https://bitbucket.org/lindenlab/sunshine-internal 2013-02-27 11:19:17 -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
Brad Payne (Vir Linden) 6a8947679c SH-3645 WIP - preserve item order after wearable save as 2013-01-16 11:34:42 -05:00
Brad Payne (Vir Linden) f48011e4d0 SH-3339 WIP, SH-3645 WIP - added getActualDescription to obviate an obnoxious and widely-used workaround, re-create COF link after wearable edit to force COF version bump 2013-01-15 20:30:20 -05:00
prep 8e8765535f SH-3620: Fix for editing a nocopy wearable being removed from the outfit 2013-01-09 12:41:51 -05:00
Logan Dethrow 9015344f8e Merged SH-3339 work with sunshine-internal. Still a WIP. 2012-12-13 18:35:07 -05:00
Logan Dethrow 3565f6f36d WIP SH-3339. Commit to merge from trunk to get build fixes, etc. 2012-12-13 18:07:50 -05:00
prep@lindenlab.com 18ff702a99 Fix for SH-3591. 2012-12-13 16:53:38 -06:00
prep 0b896a4953 Fixes for SH-3591 & SH-3620 2012-12-12 10:32:42 -05:00
simon@Simon-PC.lindenlab.com 40e78a80cc Pull and merge viewer-development 2012-12-04 14:31:15 -08: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
Logan Dethrow 632addf63d Removed a few unnecessary include lines. 2012-11-19 16:56:03 -05:00
Logan Dethrow 81219ad03b Moved implementation of incrementCofVersion to llappearancemgr.cpp. Changed retry logic to use the more robust mRetryPolicy instead of my own previous implementation. 2012-11-19 16:30:14 -05:00
Logan Dethrow 2aa56069f4 WIP SH-3339 Only try to increment the cof version if in a server bake region. 2012-11-19 14:26:59 -05:00
Logan Dethrow ee810bf2ab WIP First buildable code after adding support for SH-3339. 2012-11-16 17:07:45 -05:00
Logan Dethrow f93604c399 WIP Working on adding http request to increment the COF version when a change is made to an item in an agent's current outfit folder. SH-3339 2012-11-15 15:20:05 -05:00
Don Kjer c06c35609c Updating linux build to gcc4.6 2012-10-11 00:09:04 +00:00
maxim_productengine f7253d81d1 MAINT-826 FIXED Show the first subpart by default 2012-09-10 18:17:07 +03: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) 6e2739b76c SH-3625 - some associated cleanup, do_update field is useless in various calls because of possible race conditions 2012-08-22 16:16:54 -04:00
Nicky 57d36df3bc Make sure mWearableItem/mNameEditor are valid before dereferencing them. 2012-08-21 19:47:16 +02:00