ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-22 00:19:03 +08:00
Code Issues Packages Projects Releases Wiki Activity
20,849 Commits 5 Branches 93 Tags
68ece236a6cd8a2a9bc009287e43debdc6e9a79d
Commit Graph

2171 Commits

Author SHA1 Message Date
Melanie
68ece236a6 Protect the responses map with a lock. Also remove ugly "this." type of 
member notation.
 2012-09-23 23:55:28 +02:00
Melanie
291e57afb4 Merge branch 'ubitwork' into avination 
Conflicts:
	OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs
 2012-09-23 19:18:49 +02:00
UbitUmarov
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
UbitUmarov
11e05217df report asset upload errors the right away 2012-09-22 21:14:15 +01:00
UbitUmarov
4bba72b7af removed AssetUploaderWithCost, fixing AssetUploader. add parsing of some 
more needed fields in request
 2012-09-22 16:47:15 +01:00
UbitUmarov
7de67d5680 removed unused data in MeshUploadFlag response 2012-09-22 12:00:14 +01:00
UbitUmarov
f9c24c9414 read model upload cost parameters from config [Economy] section 2012-09-21 11:50:14 +01:00
Melanie
5d63c20122 refix prior commit 2012-09-20 15:41:16 +02:00
Melanie
9ff6c85325 Make uploads free for now - we will have to announce this 2012-09-20 15:39:46 +02:00
UbitUmarov
bf987f96d2 Fix model upload rotations and offsets ( i hope ) 2012-09-20 14:32:30 +01:00
Melanie
629138d4fa Change texture price back to 10 C$ 2012-09-19 13:01:34 +02:00
UbitUmarov
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
UbitUmarov
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
UbitUmarov
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
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
UbitUmarov
1740325392 removed broken fee compression 2012-09-17 17:49:10 +01: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
UbitUmarov
5915dfc26f Make use of mesh cost functions 2012-09-17 15:37:05 +01:00
UbitUmarov
5bbc4fb2a5 missing file for suport of mesh upload cost 2012-09-17 13:39:38 +01: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
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
Melanie
657428a439 Remove commented code 2012-09-10 01:52:02 +02:00
UbitUmarov
b7737b7273 webFetchInventory: change control event to simple flag, adjust locking 2012-09-10 01:20:34 +01: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
UbitUmarov
c298ae9e75 bug fix 2012-09-04 10:51:43 +01: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
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
Melanie
6d48dbf8ca Remove debug spam 2012-08-24 23:49:31 +02:00