Justin Clark-Casey (justincc)
5c48d7a378
factor out common HandleShow code for "show uptime"
2012-11-22 04:05:09 +00:00
Justin Clark-Casey (justincc)
74a20a62ee
refactor: Factor out copy/pasted server uptime report code
2012-11-22 03:43:21 +00:00
Melanie
5f4ac1c5a3
Merge branch 'master' into careminster
2012-11-22 03:40:30 +00:00
Melanie
c4c6121752
Merge branch 'master' into careminster
2012-11-22 03:17:33 +00:00
Justin Clark-Casey (justincc)
448811ccdd
If an asset POST does not contain well-formed XML, return a 400 (Bad Request) HTTP status rather than simply dropping the request.
2012-11-22 03:03:37 +00:00
Justin Clark-Casey (justincc)
33a4f07c4e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-11-22 03:01:26 +00:00
Robert Adams
56ef180c92
BulletSim: update DLLs and SOs. No functional changes. Only the parameter block format changed.
2012-11-21 16:44:02 -08:00
Robert Adams
cbc7e7bf85
BulletSim: Make avatar capsule so it is not circular.
...
Simple attempt to make avatars better shaped.
Replace parameter 'avatarCapsuleRadius' with 'avatarCapsuleWidth'
and 'avatarCapsuleDepth'.
More tweeking to avatar height calculation. A little better but
short avatar's feet are above the terrain and tall avatar's feet
are a little below the ground.
2012-11-21 16:43:53 -08:00
Robert Adams
4a0de01704
BulletSim: Properly position mesh terrain on creation (fixes terrain not appearing to be working). Centralize terrain shape creation logic. Remove very chatty detail log messages.
2012-11-21 16:43:45 -08:00
Robert Adams
a59368c4a1
BulletSim: add terrainImplementation parameter with default to Mesh.
2012-11-21 16:43:37 -08:00
Robert Adams
2dc7e9d3fa
BulletSim: fix line endings to be all Linux style (windows style keeps creeping in)
2012-11-21 16:43:29 -08:00
Robert Adams
34cbc738a8
BulletSim: enablement and debugging of mesh terrain.
2012-11-21 16:43:21 -08:00
Robert Adams
71b9640dfa
BulletSim: pull heightmap implementation out of the terrain manager so a mesh terrain can be implemented.
2012-11-21 16:43:14 -08:00
Robert Adams
8dd5813889
BulletSim: rename SHAPE_AVATAR to SHAPE_CAPSULE with the eye to eventually having mesh avatars.
2012-11-21 16:43:06 -08:00
Robert Adams
65e55ada87
BulletSim: uplevel FixedShapeKey out of ShapeData structure (since it is getting simplified out of existance someday) and update all the references to same.
2012-11-21 16:42:58 -08:00
Robert Adams
d6db0d5740
BulletSim: uplevel PhysicsShapeType out of ShapeData structure (since it is getting simplified out of existance someday) and update all the references to that enum.
2012-11-21 16:42:50 -08:00
Robert Adams
4d29488216
BulletSim: change PositionSanityCheck to apply a force to correct position corrections (below ground and floating).
2012-11-21 16:42:42 -08:00
Robert Adams
2f5fe4b88e
BulletSim: tweek avatar capsule parameters so avatar feet don't go below ground. This solves the bouncing, short avatar problem (Mantis 6403).
2012-11-21 16:42:34 -08:00
Justin Clark-Casey (justincc)
bac8ac32da
Add regression test for a good request made to the asset service post handler.
...
Adds new OpenSim.Server.Handlers.Tests.dll to test suite
2012-11-21 23:42:34 +00:00
Melanie
45eedb635a
Merge branch 'master' into careminster
2012-11-20 20:25:15 +00:00
Justin Clark-Casey (justincc)
f656adee31
If GetAgents() is called with an empty userIDs array then don't bother with a useless potentially network call on the scene presence service connector.
...
This also eliminates the "[PRESENCE HANDLER]: GetAgents called without required uuids argument"
which has started to pop up in the logs when a call is made with an empty uuid array as occasionally happens.
2012-11-20 10:22:49 +00:00
Justin Clark-Casey (justincc)
ea65a64f7b
refactor: Move common presence connector code into BasePresenceServiceConnector
2012-11-20 10:11:57 +00:00
Justin Clark-Casey (justincc)
5aec4f6dd0
Add Iain Oliver to CONTRIBUTORS.txt
2012-11-20 05:15:04 +00:00
Justin Clark-Casey (justincc)
597a101b9f
Minor formatting for 0962a35d
and a few one-line comments as to why that code is there
2012-11-20 05:09:44 +00:00
Iain Oliver
0962a35d2f
Fix movetotarget on mega regions.
2012-11-20 04:54:13 +00:00
Justin Clark-Casey (justincc)
dc5711ad62
minor: If logging full incoming HTTP data, don't deceptively print ... at the end of the body.
2012-11-20 04:10:03 +00:00
BlueWall
665f79e15c
Expose configuration options for the XmlRpcGridRouter
...
Expose configuration options for the XmlRpcGridRouter to allow simulators to register llRemoteData channels with an external routing service
2012-11-19 21:51:37 -05:00
Melanie
decc5318a7
Merge branch 'avination' into careminster
2012-11-20 01:21:15 +00:00
Melanie
a84b9b6b40
Merge commit 'e9153e1d1aae50024d8cd05fe14a9bce34343a0e' into careminster
2012-11-20 01:21:02 +00:00
Melanie
ccc81183b0
Merge commit '619c39e5144f15aca129d6d999bcc5c34133ee64' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
2012-11-20 01:20:59 +00:00
Melanie
0bf66434bc
Merge branch 'teravuswork' into avination
2012-11-20 00:48:13 +01:00
Melanie
9f2d232c71
Merge branch 'master' into careminster
2012-11-19 22:53:03 +00:00
Robert Adams
6c961d8add
BulletSim: Use base class constructors for initialization of BSShape and other classes.
2012-11-18 22:58:36 -08:00
Robert Adams
22be36be69
BulletSim: fix the problem with flying being disabled when crossing region boundries.
2012-11-18 22:57:26 -08:00
Robert Adams
079a1e704f
BulletSim: remove the obsolete interface to the Bullet code. Update BulletSim libraries with code stripped of the obsolete code.
2012-11-18 18:17:30 -08:00
teravus
5e0294815f
* Plumbing and basic setting of the GetMesh Cap Throttler.
...
* Last step is to flip the throttle distribution.
2012-11-17 03:47:09 -05:00
Melanie
7ad082f7c3
Merge branch 'avination' into careminster
2012-11-17 02:58:14 +00:00
Melanie
e4659a83f1
Merge branch 'master' into careminster
2012-11-17 02:03:24 +00:00
Justin Clark-Casey (justincc)
5b79bfc4df
Remove old InventoryService, which has for a long time been replaced by XInventoryService.
2012-11-17 01:32:01 +00:00
Melanie
6faa7fc7f9
Prevent a buffer overflow in asset receiving
2012-11-17 02:31:56 +01:00
Justin Clark-Casey (justincc)
392e84e554
Remove unnecessary ability to directly set InventoryItemBase.CreatorIdAsUuid
...
This was necessary historically but hasn't been for many years.
Can still get CreatorIdAsUuid, which is really just a UUID cached version of the string CreatorId
2012-11-17 01:23:29 +00:00
Justin Clark-Casey (justincc)
2aa58c5843
Do not allow invariants to change on calls to XInventoryService.UpdateItem()
...
This is to help track down http://opensimulator.org/mantis/view.php?id=6359 where creator IDs on items and rezzed objects have been reported to sometimes change.
This should never happen - a particular item should never change creators (if an item is given then a new item (with new id) is created).
Invariants are inventory type, asset type, folder (changed only on MoveItems()), CreatorIdentification and Owner.
If caller attempts to change an invariant, warning is logged but other properties are still changed.
If you see this warning, reporting on Mantis 6359 would be very welcome with the exact operation being done at the time.
2012-11-17 01:01:14 +00:00
Justin Clark-Casey (justincc)
e25c51330a
Add basic XInventoryServicesTests.TestAddItem() regression test.
2012-11-17 00:12:25 +00:00
Justin Clark-Casey (justincc)
55f889cc66
refactor: Move stat classes out of StatManager and into their own files for clarity.
2012-11-16 05:02:06 +00:00
Justin Clark-Casey (justincc)
cbc635a9c6
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-11-16 04:48:55 +00:00
Justin Clark-Casey (justincc)
cd088757e9
Add a first draft mechanism for the IncomingPacketsProcessedStat to show the delta over time.
...
The chief motivation for this is to be able to tell whether there's any impact on incoming packet processing from enabling extra packet pooling.
2012-11-16 04:36:22 +00:00
teravus
e9153e1d1a
Revert "Merge master into teravuswork", it should have been avination, not master.
...
This reverts commit dfac269032
, reversing
changes made to 619c39e514
.
2012-11-15 10:05:16 -05:00
teravus
dfac269032
Merge master into teravuswork
2012-11-15 09:46:41 -05:00
teravus
619c39e514
* Fixes mesh loading issues in last commit.
2012-11-15 09:44:02 -05:00
Diva Canto
df62d113ab
The last few AssemblyInfos. Finished!
2012-11-14 21:18:18 -08:00