ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-04 08:06:27 +08:00
Code Issues Packages Projects Releases Wiki Activity
20,881 Commits 5 Branches 88 Tags
51e1830f86cd0253879f4f60470a3b5fa2b3db7c
Commit Graph

13936 Commits

Author SHA1 Message Date
UbitUmarov
51e1830f86 more changes. Most code not in use 2012-10-04 04:55:53 +01:00
UbitUmarov
a9f2bc150f missing changed file 2012-10-03 23:18:35 +01:00
UbitUmarov
9988558ec1 meshworker basic replacement of SOP CheckSculptAndLoad ( for now disabled 
for all physics engines)
 2012-10-03 23:14:56 +01:00
UbitUmarov
4f51cc325c making meshworker have more work.. 2012-10-03 20:36:41 +01:00
UbitUmarov
7137b234b4 introduce a ODEMeshWorker class, should be pure cosmetic changes for now 2012-10-03 19:33:28 +01:00
Melanie
f433ee317b Attempt to fix Mantis #6311. Honor a destination folder if one is given 2012-10-02 23:03:52 +01:00
Melanie
f05ca1a0fe Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-09-28 00:15:58 +02:00
Melanie
7e21ddeeff Fix a possible NRE 2012-09-28 00:15:14 +02:00
UbitUmarov
58e55ae075 make some forgotten changes be done by simulation thread not by caller 2012-09-27 23:14:42 +01:00
Melanie
2998a2df6a Streamline and improve llGetMass 2012-09-26 22:30:09 +02:00
UbitUmarov
617f1b9223 just remove the damm thing 2012-09-26 16:17:49 +01:00
UbitUmarov
7e3eba1064 Seems nothing actually need the request body for getevents. so change 
control flag to false
 2012-09-26 15:41:57 +01:00
UbitUmarov
abb4b9fcae UriModule GetEvents also doesn't need a request body 2012-09-26 15:11:59 +01:00
UbitUmarov
654dd289f2 more changes to PollService 2012-09-26 03:05:27 +01:00
UbitUmarov
ef3d44240e missed change 2012-09-25 04:03:15 +01:00
UbitUmarov
4d681bfde6 do the same to webFecthInvDescModule 2012-09-25 03:59:19 +01:00
UbitUmarov
2cb17d6fbb change GetTextureModule processing 2012-09-25 03:38:45 +01:00
Melanie
421071bd8a Text changes for upload messages 2012-09-24 23:19:57 +02:00
UbitUmarov
a1a0a90720 more upload changes (plus untouch prebuild.xml) 2012-09-24 22:57:33 +01:00
UbitUmarov
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
Melanie
ca9d3760ab Merge branch 'ubitwork' into avination 2012-09-24 17:41:48 +02:00
Melanie
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
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
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
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
f2308c819e Remove spammy "axislock" debug. 2012-09-17 12:58:59 +02:00
Melanie
a79bafaaaf Change the close tmeout from 2 to 3 seconds on teleport. This may 
prevent being logged out after a successful teleport.
 2012-09-16 22:52:45 +02:00
Melanie
7d5942d154 Make IncomingCloseChildAgent not send a stop packet. This may prevent 
a viewer from being logged out after an otherwise successful teleport.
 2012-09-16 22:51:04 +02:00