98569f84a2
Merge viewer-neko
2018-01-13 19:11:09 +01:00
e181912a81
Add NULL checks
2017-10-12 10:10:50 +02:00
c182741596
Merge viewer-lynx
2016-11-16 09:55:54 +01:00
b721494405
Refactor code for rezzing under land group and concentrate it into FSCommon::getGroupForRezzing()
2016-10-26 17:42:22 +02:00
0941a48528
Apply the correct permissions based on asset type in the importer
2016-04-23 14:29:41 +02:00
84a33ae4ad
OSX: clang does not know about std::shared_ptr.
2016-04-21 15:37:06 +02:00
7fe5343338
Add additional code for object importer previously in LLAssetUploadResponder
2016-04-19 10:49:47 +02:00
7f5dacb7ed
Import object backups via coroutine.
2016-04-18 23:39:36 +02:00
6b0da7af72
Merge.
2016-01-17 01:05:13 +01:00
b3e07039a1
Fix build
2015-11-11 20:38:29 +01:00
c218e524b2
Merge - Step 1; Still enough to do.
2015-10-26 20:20:13 +01:00
5fe09cb64d
Merge Viewer-Bear
2015-08-22 03:13:17 +02:00
67fceb3ef8
Small round of clean up:
...
* Remove unused includes
* Fix a case of improper declared method
* Fixed a few cases of variable redefintions
2015-05-09 12:20:04 +02:00
217e879c20
Linux: fstream has no constructor that takes a std::string.
2015-05-06 16:34:41 +02:00
4310d51e81
More memoryleaks...
2015-04-18 01:39:34 +02:00
81a1a686fc
Fix FSAssetResponder and use new cURL API
2015-01-11 03:28:15 +01:00
c952913ff3
Replace changes of LLInventoryModel::item_array_t being a vector now.
2014-06-10 19:42:37 +02:00
6a911a9e8a
Stats changes v2.
2014-06-10 19:19:22 +02:00
3e299bee08
Changes to use the new stats system.
2014-06-10 19:04:04 +02:00
8863d9beaf
Compile fixes
2014-06-09 23:27:05 -07:00
1668af80b1
Initial materials support for the object exporter.
2013-12-01 12:35:35 -07:00
9750f48b14
Make import build offset a setting
2013-10-01 17:34:58 -06:00
5c0e632ad5
Export improvements:
...
FIRE-9625 - Make Import Linkset work like the other uploaders
FIRE-11646 - Option to not backup object contents
Combined permission checks into a single namespace
Added object export floater for a more consistent workflow with collada export
2013-09-27 23:27:00 -06:00
c0d8d83b32
Hide temporary upload checkbox if uploads are free or SSA is in use.
2013-08-27 20:41:39 -05:00
3a0fd0240d
Fix spelling error.
2013-07-12 09:25:58 -05:00
fa6af6185e
FIRE-10628: Option to not toast the upload payment notifications.
...
Remove orphaned DebugShowUploadCost
2013-06-14 19:48:40 -06:00
9d2eb45562
Export/Import: Minor code cleanup.
2013-05-06 00:42:42 -04:00
15d98a5e21
Import: Add throttle to inventory drops into objects/prims to prevent problems.
...
Fix a logic bug. notNull should have been isNull, would have cause extra inventory searches.
Removed unused membor variable.
Minor code cleanup.
2013-05-06 00:34:26 -04:00
c77cad5c2b
FIRE-9655 Fix for blank notecard export/import.
...
Turns out to be a LL bug, blank notecard item can point to a NULL asset. So on export, create a blank notecard asset and save
that instead of a NULL.
Fix object import of contents of just LSL scripts.
Fix debug info typo.
Added some more debug info for future use.
2013-04-28 17:06:12 -04:00
24a136a3fc
Fix content breaking bug. Keep track of ObjectAdd msg and reset to zero when rezzing items from inventory.
2013-04-03 10:08:54 -04:00
0eed7b149e
Filepicker filters for import/export
2013-03-25 15:47:29 -06:00
29a16359f7
First round of export and import support.
2013-03-24 20:35:24 -04:00
Ansariel