bd0bd119c0
EXP-1594 FIXED Stop the upload progress indicator if inventory texture upoload fails.
2011-11-16 20:07:55 +02:00
41e6455f74
STORM-1580 WIP Updated texture upload progress according to the spec.
...
By the way, fixed displaying upload cost.
2011-11-03 18:03:36 +02:00
10ec004912
merge from viewer-experience
2011-08-12 14:53:25 -07:00
dd3069127b
merge
2011-07-13 14:57:23 -04:00
7b9fc42941
merge changes for storm-1325
2011-07-11 16:49:29 -04:00
3cca342ffb
SH-1790 FIX - use the inventory flags returned by server when available
2011-07-01 17:31:53 -04:00
1a44e5b3e9
FIX STORM-1325 Retry bake uploads in case of upload failure
2011-06-15 21:19:12 +03:00
69391625eb
SH-1677 FIXED [REGRESSION] Bulk uploads do not adhere to default permissions
...
no idea how this ever worked before, as the code since 1.23 has been using the wrong keyword ("everyone_mask" instead of "new_everyone_mask"). I suspect something changed on the sim side?
2011-05-30 13:53:49 -04:00
fdf19a5268
Automated merge up from viewer-development
2011-01-10 11:20:39 -05:00
8cfea0bab1
VWR-1095 fix for problems with uploads following bulk upload failure
...
de minimus contribution accepted without CA - Oz Linden
2011-01-07 15:08:42 -05:00
a5619d16f7
correct licenses (fix problem with license change merge)
2010-10-13 07:24:37 -04:00
fae96a240a
Missed a file from last commit.
2010-09-28 13:52:53 -05:00
613894c8cc
SH-238 Add check boxes to upload skin weights (or not) and/or joint positions (or not).
...
Remove llfloaterimportcollada
Reviewed by Prep.
2010-09-28 13:45:42 -05:00
7c2b9221d6
merge
2010-09-27 15:20:27 -05:00
cf09d6c58a
Remove LL_MESH_ENABLED macros (fixes drag and drop). Add mesh stitching type back into tools floater.
2010-09-22 03:04:21 -05:00
90e3d83a5c
Fix for build failures - disabling tcmalloc for now
2010-09-21 13:26:52 -04:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
f8c91bad6b
merge backout.
2010-06-15 14:48:31 +01:00
f4b7164752
Backed out changeset 1c66b34b7fbe
2010-06-15 14:48:14 +01:00
f9b13d8f85
Add "LL_MESH_ENABLED" preprocessor flag for toggling mesh code. Couple of merge fixes.
2010-06-10 00:45:48 -05:00
f461ae214c
Merge with render-pipeline
2010-06-07 23:05:22 -05:00
d84990307b
VI-65 - Addition of Quick/Eazy Buy Web based floater.
...
Switched off by default for now until Web content ready - turn on with Debug Settings - 'QuickBuyCurrency'
Reviewed by Sam/Richard
2010-05-21 15:22:32 -07:00
1dade05ee7
YET another hairy merge from viewer-trunk. Conflicts resolved... so far.
2010-04-06 16:10:16 +01:00
2eba9819df
EXT-6703 : LLInventory.h cleanup and create new LLInventoryDefines
...
Took out enums and flags from LLInventory into LLInventoryDefines
Did a bunch of header file reformatting for LLInventory.h
Change made to simulator files as well.
2010-04-05 15:02:36 -04:00
61774546f0
HUGE merge from viewer-trunk. Many conflicts resolved.
2010-03-30 13:15:36 +01:00
b2a667b722
For EXT-4666: changed LLGestureManager to LLGestureMgr throughout
2010-03-29 11:10:54 -04:00
da407e32fd
Merge
2010-03-24 16:51:07 -07:00
7480e06934
Hooked up Save As Profile Pic
...
reviewed by Richard CC# 167
2010-03-24 16:39:59 -07:00
8424ceb20f
merge
2010-03-20 16:59:41 -05:00
c74f870151
(EXT-5982) [FRAGMENTATION] L$ kaufen window (Buy L$)
...
- Moved hardcoded strings in LLFloaterBuyCurrency::buyCurrency() calls to strings.xml
Reviewed by Vadim Savchuk https://codereview.productengine.com/secondlife/r/56/
--HG--
branch : product-engine
2010-03-18 19:42:38 +02:00
b3f305ae94
Implemented normal task EXT-5982([HARD CODED] on L$ kaufen window (Buy L$)).
...
- Moved hardcoded strings in LLFloaterBuyCurrency::buyCurrency() calls to strings.xml
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/33/
--HG--
branch : product-engine
2010-03-16 18:29:56 +02:00
16a30929f9
Inventory now updates appropriately when using model uploader.
2010-03-05 13:17:31 -06:00
3972ae18d1
Backed out changeset: 0e0f8b0b0fa8
2010-01-07 08:49:34 -06:00
078278bf51
LLImportCollada no longer a singleton to prepare for subclassing.
2010-01-06 15:02:43 -06:00
6aa71844a8
Merge with viewer-2-0
2009-12-18 13:24:29 -06:00
4fc7b91a79
implemented EXT-2323 “Get rid from obsolete notification widgets”;
...
--HG--
branch : product-engine
2009-12-11 14:26:27 +02:00
cd138869d5
fix of another merge borkasaurus
2009-12-07 17:38:45 -08:00
1590f187cf
Fixing merge borkasaurs.
2009-12-07 16:58:05 -08:00
85488f5414
Merge of viewer 2 changes
2009-12-07 16:03:56 -08:00
8fdd2e0b28
EXT-3028 : "Find Original" does nothing if floater inventory isn't open
...
Changed logic for getActiveInventory so that it considers InventorySP.
Removed getActiveInventory and replaced with getActiveInventoryPanel since that follows its current usage.
This currently contains a bug because the InventorySP always thinks it's open.
--HG--
branch : avatar-pipeline
2009-12-01 21:12:34 -05:00
f31f817ee6
retry asset upload failures.
2009-11-25 13:10:09 -06:00
cbc0783cd1
Created lightweight LLNotificationsUtil::add(), switched most alerts to use it
...
Cuts number of includes of llnotifications.h from 300+ to 40.
2009-11-25 01:15:50 -08:00
0e351bedb6
Removed llnotifications.h from all headers by adding llnotificationsptr.h
...
Fixed many more includes
2009-11-24 22:55:56 -08:00
1f71cd20e8
Fixed variable price upload path.
2009-11-18 11:38:31 -08:00
53495d74ee
Automated merge with ssh://palmer@hg.lindenlab.com/viewer/viewer-2-0
2009-11-17 13:40:11 -08:00
acdce23299
Header file cleanup
...
Removed unnecessary "#include llinventorymodel.h" now that llinventoryobserver was split from llinventorymodel.
--HG--
branch : avatar-pipeline
2009-11-13 17:47:00 -05:00
6f3536d597
Merged in viewer 2 changes, adjusted xui problems, added mesh folder type and more mesh inventory type info
2009-11-11 15:16:49 -08:00
7fa6982520
super importer stuff (gui, texture upload, etc.)
2009-11-09 17:57:21 -06:00
afe6350160
merge from texture-pipeline
2009-11-06 12:15:41 -08:00
35e200881c
merge QAR-1829: texture pipeline branch in viewer-2.0.0.3
2009-11-06 06:52:24 +00:00
Vadim ProductEngine