ubit
|
b4209caadd
|
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
|
2012-09-18 03:47:42 +02:00 |
|
ubit
|
e9af09084c
|
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
|
2012-09-18 02:17:16 +02:00 |
|
Melanie
|
ac2380bbfa
|
Add booleans to control whether we actually crete inventory items
|
2012-09-18 02:12:07 +02:00 |
|
UbitUmarov
|
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 |
|
UbitUmarov
|
fd20ef5c91
|
add some locks to GetTextureModule
|
2012-09-17 22:35:36 +01:00 |
|
UbitUmarov
|
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 |
|
UbitUmarov
|
c3666c9ec3
|
make sure client still has money at upload
|
2012-09-17 19:38:05 +01:00 |
|
UbitUmarov
|
7f5b1182ef
|
same cleanup
|
2012-09-17 19:09:51 +01:00 |
|
ubit
|
4336806ddf
|
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
|
2012-09-17 18:49:56 +02:00 |
|
UbitUmarov
|
1740325392
|
removed broken fee compression
|
2012-09-17 17:49:10 +01:00 |
|
ubit
|
1e3914236d
|
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
|
2012-09-17 16:52:40 +02:00 |
|
UbitUmarov
|
df77724bbc
|
let mesh model estimator work even without money module, so other
estimations can work
|
2012-09-17 15:50:59 +01:00 |
|
ubit
|
f3f955b19b
|
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
|
2012-09-17 16:38:14 +02:00 |
|
UbitUmarov
|
5915dfc26f
|
Make use of mesh cost functions
|
2012-09-17 15:37:05 +01:00 |
|
ubit
|
590c752c23
|
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
|
2012-09-17 14:40:09 +02:00 |
|
UbitUmarov
|
5bbc4fb2a5
|
missing file for suport of mesh upload cost
|
2012-09-17 13:39:38 +01:00 |
|
ubit
|
434704fa99
|
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
|
2012-09-17 14:35:01 +02:00 |
|
ubit
|
6e115798b7
|
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
|
2012-09-17 14:34:12 +02:00 |
|
Melanie
|
387e59ff7f
|
Revamp the HTTP textures handler to allow a maximum of four fetches
at any time and to drop requests for avatars n longer in the scene
|
2012-09-14 21:24:25 +02:00 |
|
Melanie
|
45fe25de0d
|
Allow some more connections to try to ease lag.
|
2012-09-14 00:14:39 +02:00 |
|
Melanie
|
e7932682a2
|
Add a logger so the prior commit will work
|
2012-09-12 21:24:09 +02:00 |
|
Melanie
|
d8e9188908
|
Stop expiry timer when upload is complete. Log if timeout is reached.
|
2012-09-12 21:14:55 +02:00 |
|
Melanie
|
5139db2638
|
Add a timer to time out upload caps handlers that are not used.
|
2012-09-12 12:56:59 +02:00 |
|
Melanie
|
fd1ee58f87
|
Add a missing brace, remove a useless temp variable, enable charging.
|
2012-09-11 22:52:11 +02:00 |
|
UbitUmarov
|
013e94af5d
|
report mesh upload costs ( fake values)
|
2012-09-11 23:06:29 +01:00 |
|
UbitUmarov
|
245763b1b0
|
let LLSDAssetUploadRequest include asset_resources information plus let
NewAgentInventoryRequest know about mesh (does nothing with it still)
|
2012-09-11 20:30:30 +01:00 |
|
Melanie
|
19b00a5b3c
|
Removing the variable prica handler again. It's never called, was misnamed and
probably never worked past the mesh beta.
|
2012-09-11 17:58:46 +02:00 |
|
Melanie
|
757a669924
|
Re-add the module and fix a typo
|
2012-09-11 17:55:33 +02:00 |
|
Melanie
|
375ca478dd
|
Rename NewFileAgentInventoryVariablePrice to NewAgentInventoryVariablePrice
which is the name actually used in viewer code.
|
2012-09-11 17:52:24 +02:00 |
|
Melanie
|
a6928a479e
|
Add cost calculation suppor tto the VariablePrice one as well
|
2012-09-11 17:51:20 +02:00 |
|
Melanie
|
ead4b8998c
|
Revert "Remove the unused NewFileAgentInventoryVariablePrice module."
It's actually used.
This reverts commit 94a8e5572b.
|
2012-09-11 17:28:37 +02:00 |
|
Melanie
|
bd1d9a214b
|
Add the option to have variable costing for uploads
|
2012-09-11 17:28:13 +02:00 |
|
Melanie
|
94a8e5572b
|
Remove the unused NewFileAgentInventoryVariablePrice module.
|
2012-09-11 15:07:32 +02:00 |
|
ubit
|
ba6a2ec526
|
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
|
2012-09-11 13:32:26 +02:00 |
|
Melanie
|
a6753c14a5
|
Revamp the v3 inventory sending. Uses threads and some nifty mechanics to
leverage the Poll Service without blocking it's workers.
|
2012-09-11 10:39:43 +02:00 |
|
ubit
|
a2ace1b61a
|
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
|
2012-09-10 02:27:26 +02:00 |
|
UbitUmarov
|
b7737b7273
|
webFetchInventory: change control event to simple flag, adjust locking
|
2012-09-10 01:20:34 +01:00 |
|
Melanie
|
657428a439
|
Remove commented code
|
2012-09-10 01:52:02 +02:00 |
|
ubit
|
b776aa1665
|
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
|
2012-09-08 13:35:09 +02:00 |
|
UbitUmarov
|
a91ca984d5
|
llClientView: try to have only one thread per client processing
RegionHandleRequests. (code assumes packet handle is called async as it is not)
|
2012-09-08 12:22:40 +01:00 |
|
ubit
|
ed4ad93fef
|
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
|
2012-09-04 11:53:04 +02:00 |
|
UbitUmarov
|
c298ae9e75
|
bug fix
|
2012-09-04 10:51:43 +01:00 |
|
ubit
|
a6bbaba7ef
|
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
|
2012-09-04 08:42:15 +02:00 |
|
UbitUmarov
|
d4fad2ba42
|
a forgotten file plus minor changes. Imp and SL viewer seem to preserve
flight. FS 4.2.2 does not.
|
2012-09-04 07:32:03 +01:00 |
|
ubit
|
c93b2db9f2
|
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
|
2012-09-01 03:12:10 +02:00 |
|
ubit
|
194eb78b90
|
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
|
2012-08-30 01:29:43 +02:00 |
|
Melanie
|
211f4fb411
|
Sequence inventory descendents requests to reduce inventory server load and
movement lag.
|
2012-08-30 00:34:12 +02:00 |
|
Melanie
|
74465df43f
|
Fix issue with the quit packet being stuck int he queue and a one packet delay.
Also fix semaphore excetion caused by enqueueing while dequque is taking place.
|
2012-08-29 11:45:28 +02:00 |
|
Melanie
|
34f0694938
|
Remove Justin's addition to avoid sending incoming packets to inactive clients
This also causes the initial AgentUpdate to be rejected because our processing
is asynchronous.
|
2012-08-29 11:35:21 +02:00 |
|
Melanie
|
378a79e7cc
|
Add a queue with two priority levels. This is a drop in replacement for
the BlockingQueue from OMV, but allows two priorities.
|
2012-08-28 22:17:17 +02:00 |
|