893b44497d
Merge branch 'avination' into ubitwork
2012-10-04 05:05:57 +01:00
51e1830f86
more changes. Most code not in use
2012-10-04 04:55:53 +01:00
a9f2bc150f
missing changed file
2012-10-03 23:18:35 +01:00
9988558ec1
meshworker basic replacement of SOP CheckSculptAndLoad ( for now disabled
...
for all physics engines)
2012-10-03 23:14:56 +01:00
4f51cc325c
making meshworker have more work..
2012-10-03 20:36:41 +01:00
7137b234b4
introduce a ODEMeshWorker class, should be pure cosmetic changes for now
2012-10-03 19:33:28 +01:00
fdacb88b29
Fix a viewer crash issue
2012-10-03 17:11:02 +02:00
f433ee317b
Attempt to fix Mantis #6311 . Honor a destination folder if one is given
2012-10-02 23:03:52 +01:00
f05ca1a0fe
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-28 00:15:58 +02:00
7e21ddeeff
Fix a possible NRE
2012-09-28 00:15:14 +02:00
58e55ae075
make some forgotten changes be done by simulation thread not by caller
2012-09-27 23:14:42 +01:00
285039949c
Update the Http server with a few additional properties. Adapt the test
...
server code to match.
2012-09-27 18:27:49 +01:00
a0065ad616
create a new PollServiceHttpRequest req per loop since they can be sent to
...
another working thread
2012-09-27 00:14:50 +01:00
6cf51c329a
Merge branch 'ubitwork' into avination
2012-09-26 23:49:02 +02:00
2998a2df6a
Streamline and improve llGetMass
2012-09-26 22:30:09 +02:00
a70352db17
don't send a partial contents report if we are sending all data
2012-09-26 21:03:31 +01:00
c3ea00f16e
add assettype mesh to list of binary assets
2012-09-26 20:31:34 +01:00
9a04269644
fix GetTextureHandler range
2012-09-26 16:49:39 +01:00
be9cef8682
missing file
2012-09-26 16:20:26 +01:00
617f1b9223
just remove the damm thing
2012-09-26 16:17:49 +01:00
7e3eba1064
Seems nothing actually need the request body for getevents. so change
...
control flag to false
2012-09-26 15:41:57 +01:00
abb4b9fcae
UriModule GetEvents also doesn't need a request body
2012-09-26 15:11:59 +01:00
67fa657746
keep watchdog happy using it to kill his threads
2012-09-26 04:52:19 +01:00
654dd289f2
more changes to PollService
2012-09-26 03:05:27 +01:00
5d986002fd
fix priorityQueue to correctly use the fairness counts starting at 8 for
...
nonimediate queues. Imediate queues where not taken into account so it
was unused.
2012-09-26 00:17:54 +01:00
ef3d44240e
missed change
2012-09-25 04:03:15 +01:00
4d681bfde6
do the same to webFecthInvDescModule
2012-09-25 03:59:19 +01:00
2cb17d6fbb
change GetTextureModule processing
2012-09-25 03:38:45 +01:00
421071bd8a
Text changes for upload messages
2012-09-24 23:19:57 +02:00
a1a0a90720
more upload changes (plus untouch prebuild.xml)
2012-09-24 22:57:33 +01:00
7ae0b5e605
touch prebuild.xml
2012-09-24 21:28:03 +01: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
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
11e05217df
report asset upload errors the right away
2012-09-22 21:14:15 +01:00
4bba72b7af
removed AssetUploaderWithCost, fixing AssetUploader. add parsing of some
...
more needed fields in request
2012-09-22 16:47:15 +01: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
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
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
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