7ae0b5e605
touch prebuild.xml
2012-09-24 21:28:03 +01:00
653d97b739
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-24 22:25:21 +02:00
ca67ee60ac
add missing transactionID in SendInventoryItemCreateUpdate. and make use
...
of it on inventoryAccessModule, etc. Most likelly it's needs where there
is a transactionID not zero
2012-09-24 21:22:08 +01:00
ca9d3760ab
Merge branch 'ubitwork' into avination
2012-09-24 17:41:48 +02:00
6963b96bd0
If an asset upload transaction doesn't exist for a CreateInventory request,
...
simply process it as if UUID.Zero had been given.
2012-09-24 13:41:48 +02:00
68ece236a6
Protect the responses map with a lock. Also remove ugly "this." type of
...
member notation.
2012-09-23 23:55:28 +02:00
b8119ada59
Merge branch 'ubitwork' into avination
2012-09-23 23:47:56 +02:00
2d02405186
Change the poll service to use a thread pool for replies to make sure the
...
event queues aren't blocked by other traffic.
2012-09-23 23:16:25 +02:00
a5d969d92f
Comment out asset error for sculpts/meshes. If an asset is missing it's missing.
...
We can't put it back so we don't need to know.
2012-09-23 20:57:36 +02:00
291e57afb4
Merge branch 'ubitwork' into avination
...
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs
2012-09-23 19:18:49 +02:00
2112962311
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-23 16:13:24 +02:00
64db9e4114
try to allow free uploads for testing, if users prefix names with "TEST-". Let
...
textures get into inventory again. Both features under config control.
Have direct warnings to client, including a final one on upload complete
since i see nothing. problems: textures don't showup in inventory til
relog, also issues with permitions. A few more changes
2012-09-23 15:04:10 +01:00
80a81896b6
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-22 22:15:35 +02:00
11e05217df
report asset upload errors the right away
2012-09-22 21:14:15 +01:00
93eaaf2ade
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-22 17:47:59 +02:00
4bba72b7af
removed AssetUploaderWithCost, fixing AssetUploader. add parsing of some
...
more needed fields in request
2012-09-22 16:47:15 +01:00
d25a67851d
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-22 13:37:42 +02:00
7de67d5680
removed unused data in MeshUploadFlag response
2012-09-22 12:00:14 +01:00
f9c24c9414
read model upload cost parameters from config [Economy] section
2012-09-21 11:50:14 +01:00
a6b2a35ddf
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-21 01:36:16 +02:00
5d63c20122
refix prior commit
2012-09-20 15:41:16 +02:00
9ff6c85325
Make uploads free for now - we will have to announce this
2012-09-20 15:39:46 +02:00
bf987f96d2
Fix model upload rotations and offsets ( i hope )
2012-09-20 14:32:30 +01:00
629138d4fa
Change texture price back to 10 C$
2012-09-19 13:01:34 +02:00
a44939e951
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-19 04:59:48 +02:00
5317b1053f
be more tolerant to small prims, skipping them, only failing if they are
...
more than half of total. Add a state control to NewFileAgentInventory
to avoid more than one at a time per client. ( Incomplete and possible not that good)
2012-09-19 03:53:51 +01:00
453c008998
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-19 02:35:12 +02:00
fb32604b41
create a single ModelCost provider for the caps instance. Let it know and
...
check scene prim size limits.
2012-09-19 01:33:16 +01:00
51ca84afdf
coment out mesh model upload code to add textures and individual meshs
...
assets to inventory, since it may actually be a bad ideia since good
model textures are deply related to it and there is no current use for
independent mesh assets. Added the option to have a reduced free for textures (2.5 C$ as is, total textures cost rounded to nearest int) compensating for the fact that they can't be used outside the model or its parts.
2012-09-19 00:29:16 +01:00
b4209caadd
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-18 03:47:42 +02:00
e9af09084c
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-18 02:17:16 +02:00
ac2380bbfa
Add booleans to control whether we actually crete inventory items
2012-09-18 02:12:07 +02:00
e8ba26eac8
***TEST*** still bad... create inventory itens for model textures and meshs. Issues: meshs get into root folder, viewer and viewer does not update inventory until relog ( the upload funtion needs to return more information) ,etc. Droping a mesh into a prim, makes viewer think we dropped a sculpt map, but it does work, viewer displays the mesh and physics work (as physics is stored at the sculpt information fields). Textures show up in Textures folder, just its to costly to find that default folder as is..
2012-09-18 01:07:44 +01:00
fd20ef5c91
add some locks to GetTextureModule
2012-09-17 22:35:36 +01:00
c1eec3b828
on upload store mesh list contents as mesh assets. Build prims by instances not
...
meshs. (some prims can have same mesh)
2012-09-17 21:15:07 +01:00
c3666c9ec3
make sure client still has money at upload
2012-09-17 19:38:05 +01:00
7f5b1182ef
same cleanup
2012-09-17 19:09:51 +01:00
4336806ddf
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-17 18:49:56 +02:00
1740325392
removed broken fee compression
2012-09-17 17:49:10 +01:00
1e3914236d
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-17 16:52:40 +02:00
df77724bbc
let mesh model estimator work even without money module, so other
...
estimations can work
2012-09-17 15:50:59 +01:00
f3f955b19b
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-17 16:38:14 +02:00
5915dfc26f
Make use of mesh cost functions
2012-09-17 15:37:05 +01:00
279c87d0f3
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-17 14:52:49 +02:00
f79de2232e
fix build
2012-09-17 13:52:27 +01:00
590c752c23
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-17 14:40:09 +02:00
5bbc4fb2a5
missing file for suport of mesh upload cost
2012-09-17 13:39:38 +01:00
434704fa99
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-17 14:35:01 +02:00
6e115798b7
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-17 14:34:12 +02:00
bc85c1d084
add suport funtions for mesh upload costs
2012-09-17 13:32:58 +01:00
UbitUmarov